mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: [STUDIO-3371] finish preset loading dialog even on error 

Change-Id: Idbb4c81bb0a09f752ecb2ad2715ff75746c19df5
This commit is contained in:
chunmao.guo 2023-07-06 13:29:04 +08:00 committed by Lane.Wei
parent 989e4214c5
commit 16a4742d1f
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4638,7 +4638,7 @@ void GUI_App::start_sync_user_preset(bool with_progress_dlg)
ProgressFn progressFn; ProgressFn progressFn;
WasCancelledFn cancelFn; WasCancelledFn cancelFn;
std::function<void()> finishFn; std::function<void(bool)> finishFn;
if (with_progress_dlg) { if (with_progress_dlg) {
auto dlg = new ProgressDialog(_L("Loading"), "", 100, this->mainframe, wxPD_AUTO_HIDE | wxPD_APP_MODAL | wxPD_CAN_ABORT); auto dlg = new ProgressDialog(_L("Loading"), "", 100, this->mainframe, wxPD_AUTO_HIDE | wxPD_APP_MODAL | wxPD_CAN_ABORT);
@ -4649,26 +4649,19 @@ void GUI_App::start_sync_user_preset(bool with_progress_dlg)
}); });
}; };
cancelFn = [this, dlg]() { cancelFn = [this, dlg]() {
bool was_canceled = dlg->WasCanceled(); return dlg->WasCanceled();
if (was_canceled) {
CallAfter([=] {
dlg->Destroy();
reload_settings();
});
}
return was_canceled;
}; };
finishFn = [this, dlg] { finishFn = [this, dlg](bool ok) {
CallAfter([=]{ CallAfter([=]{
dlg->Destroy(); dlg->Destroy();
reload_settings(); if (ok) reload_settings();
}); });
}; };
} }
else { else {
finishFn = [this] { finishFn = [this](bool ok) {
CallAfter([=] { CallAfter([=] {
reload_settings(); if (ok) reload_settings();
}); });
}; };
} }
@ -4681,8 +4674,7 @@ void GUI_App::start_sync_user_preset(bool with_progress_dlg)
// get setting list, update setting list // get setting list, update setting list
std::string version = preset_bundle->get_vendor_profile_version(PresetBundle::BBL_BUNDLE).to_string(); std::string version = preset_bundle->get_vendor_profile_version(PresetBundle::BBL_BUNDLE).to_string();
int ret = m_agent->get_setting_list(version, progressFn, cancelFn); int ret = m_agent->get_setting_list(version, progressFn, cancelFn);
if (ret == 0) finishFn(ret == 0);
finishFn();
int count = 0, sync_count = 0; int count = 0, sync_count = 0;
std::vector<Preset> presets_to_sync; std::vector<Preset> presets_to_sync;