mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-06-14 16:02:55 +00:00
2.2.0 pre4 (#84)
* Fix crash * Update: Flutter 1223 * fix: networktestdialog crash * Update Flutter 1223 * bump profile version to 02.02.42.02 * bump min_firm_ver to 1.0.0
This commit is contained in:
@@ -1122,7 +1122,7 @@ GUI_App::GUI_App()
|
||||
m_fltviews.set_app(this);
|
||||
}
|
||||
|
||||
void GUI_App::shutdown()
|
||||
void GUI_App::shutdown(bool isRecreate)
|
||||
{
|
||||
BOOST_LOG_TRIVIAL(info) << "GUI_App::shutdown enter";
|
||||
|
||||
@@ -1156,7 +1156,7 @@ void GUI_App::shutdown()
|
||||
}
|
||||
|
||||
// Delete WebPresetDialog to ensure proper cleanup
|
||||
if (SSWCP_MqttAgent_Instance::m_dialog != nullptr) {
|
||||
if (SSWCP_MqttAgent_Instance::m_dialog != nullptr && !isRecreate) {
|
||||
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(": destroy WebPresetDialog");
|
||||
delete SSWCP_MqttAgent_Instance::m_dialog;
|
||||
SSWCP_MqttAgent_Instance::m_dialog = nullptr;
|
||||
@@ -3614,7 +3614,8 @@ void GUI_App::recreate_GUI(const wxString &msg_name)
|
||||
|
||||
update_http_extra_header();
|
||||
|
||||
mainframe->shutdown();
|
||||
mainframe->shutdown(true);
|
||||
|
||||
ProgressDialog dlg(msg_name, msg_name, 100, nullptr, wxPD_AUTO_HIDE);
|
||||
dlg.Pulse();
|
||||
dlg.Update(10, _L("Rebuild") + dots);
|
||||
|
||||
Reference in New Issue
Block a user