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

FIX: avoid multiple unsaved dialog \(2\)

Browse source 
Change-Id: Ia41ede7c78d6218691694b3d3c8d05f2275bb014
This commit is contained in:
chunmao.guo 2023-06-12 15:54:09 +08:00 • committed by Lane.Wei
parent e1bd4e2529
commit 415c4ede8a
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3715,15 +3715,16 @@ void GUI_App::request_user_login(int online_login)
void GUI_App::request_user_logout() void GUI_App::request_user_logout()
{ {
if (m_agent && m_agent->is_user_login()) { if (m_agent && m_agent->is_user_login()) {
// Update data first before showing dialogs
m_agent->user_logout();
m_agent->set_user_selected_machine("");
/* delete old user settings */
bool transfer_preset_changes = false; bool transfer_preset_changes = false;
wxString header = _L("Some presets are modified.") + "\n" + wxString header = _L("Some presets are modified.") + "\n" +
_L("You can keep the modifield presets to the new project, discard or save changes as new presets."); _L("You can keep the modifield presets to the new project, discard or save changes as new presets.");
using ab = UnsavedChangesDialog::ActionButtons; using ab = UnsavedChangesDialog::ActionButtons;
wxGetApp().check_and_keep_current_preset_changes(_L("User logged out"), header, ab::KEEP | ab::SAVE, &transfer_preset_changes); wxGetApp().check_and_keep_current_preset_changes(_L("User logged out"), header, ab::KEEP | ab::SAVE, &transfer_preset_changes);
m_agent->user_logout();
m_agent->set_user_selected_machine("");
/* delete old user settings */
m_device_manager->clean_user_info(); m_device_manager->clean_user_info();
GUI::wxGetApp().sidebar().load_ams_list({}, {}); GUI::wxGetApp().sidebar().load_ams_list({}, {});
remove_user_presets(); remove_user_presets();