3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-08 07:27:41 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

FIX: display wrong password when connect failed

Browse source 
Change-Id: Iebdf6ca78e4e98a60b60793a259dcfb4615894cc
This commit is contained in:
Stone Li 2022-07-25 16:03:23 +08:00 • committed by Lane.Wei
parent a9fd7c762e
commit 7986b302de
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/slic3r/GUI/GUI_App.cpp
View file

@ -1519,10 +1519,13 @@ void GUI_App::init_networking_callbacks()
obj->command_get_version(); obj->command_get_version();
} else if (state == ConnectStatus::ConnectStatusFailed || ConnectStatus::ConnectStatusLost) { } else if (state == ConnectStatus::ConnectStatusFailed || ConnectStatus::ConnectStatusLost) {
obj->set_access_code(""); obj->set_access_code("");
wxString text = wxString::Format(_L("Connect %s[SN:%s] failed!"), from_u8(obj->dev_name), obj->dev_id); wxString text;
MessageDialog msg_dlg(nullptr, text, "", wxAPPLY | wxOK); if (msg == "5") {
if (msg_dlg.ShowModal() == wxOK) { text = wxString::Format(_L("Incorrect password"));
return; wxGetApp().show_dialog(text);
} else {
text = wxString::Format(_L("Connect %s failed! [SN:%s, code=%s]"), from_u8(obj->dev_name), obj->dev_id, msg);
wxGetApp().show_dialog(text);
} }
} else { } else {
BOOST_LOG_TRIVIAL(info) << "set_on_local_connect_fn: state = " << state; BOOST_LOG_TRIVIAL(info) << "set_on_local_connect_fn: state = " << state;
@ -1960,13 +1963,13 @@ bool GUI_App::on_init_inner()
}); });
Bind(EVT_SHOW_DIALOG, [this](const wxCommandEvent& evt) { Bind(EVT_SHOW_DIALOG, [this](const wxCommandEvent& evt) {
/*wxString msg = evt.GetString(); wxString msg = evt.GetString();
InfoDialog dlg(this->mainframe, _L("Info"), msg); InfoDialog dlg(this->mainframe, _L("Info"), msg);
dlg.ShowModal();*/ dlg.ShowModal();
wxString text = evt.GetString(); /*wxString text = evt.GetString();
Slic3r::GUI::MessageDialog msg_dlg(this->mainframe, text, "", wxAPPLY | wxOK); Slic3r::GUI::MessageDialog msg_dlg(this->mainframe, text, "", wxAPPLY | wxOK);
msg_dlg.ShowModal(); msg_dlg.ShowModal();*/
}); });
} }
else { else {