juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-17 02:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: shutdown GUI_App after confirm dialog

Browse Source 
Change-Id: Ie379e9e764f43be1592a74b929bfbfc1d2d41a49
Signed-off-by: Stone Li <stone.li@bambulab.com>
This commit is contained in:
Stone Li
2022-07-25 18:10:52 +08:00
committed by Lane.Wei
parent e0c4453c46
commit a9fd7c762e
3 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/slic3r/GUI/GUI_App.cpp
View File

@@ -1105,6 +1105,23 @@ GUI_App::GUI_App()
reset_to_active();
}
void GUI_App::shutdown()
{
m_is_closing = true;
stop_sync_user_preset();
if (m_device_manager) {
delete m_device_manager;
m_device_manager = nullptr;
}
if (m_agent) {
m_agent->start_discovery(false, false);
delete m_agent;
m_agent = nullptr;
}
}
std::string GUI_App::get_http_url(std::string country_code)
{
@@ -2703,21 +2720,7 @@ void GUI_App::persist_window_geometry(wxTopLevelWindow *window, bool default_max
const std::string name = into_u8(window->GetName());
window->Bind(wxEVT_CLOSE_WINDOW, [=](wxCloseEvent &event) {
m_is_closing = true;
window_pos_save(window, "mainframe");
//
stop_sync_user_preset();
if (m_device_manager) {
delete m_device_manager;
m_device_manager = nullptr;
}
if (m_agent) {
m_agent->start_discovery(false, false);
delete m_agent;
m_agent = nullptr;
}
event.Skip();
});