3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Follow-up to 010fbded1a - Save app_config before a place of potential crash + fixed non-MSW build

Browse Source
This commit is contained in:
YuSanka 2022-01-11 14:22:40 +01:00
parent 010fbded1a
commit 1dffc40f32
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1151,9 +1151,11 @@ bool GUI_App::on_init_inner()
splashscreen_pos = metrics->get_rect().GetPosition(); splashscreen_pos = metrics->get_rect().GetPosition();
} }
if (!default_splashscreen_pos) if (!default_splashscreen_pos) {
// workaround for crash related to the positioning of the window on secondary monitor // workaround for crash related to the positioning of the window on secondary monitor
get_app_config()->set("restore_win_position", "crashed_at_splashscreen_pos"); get_app_config()->set("restore_win_position", "crashed_at_splashscreen_pos");
get_app_config()->save();
}
// create splash screen with updated bmp // create splash screen with updated bmp
scrn = new SplashScreen(bmp.IsOk() ? bmp : create_scaled_bitmap("PrusaSlicer", nullptr, 400), scrn = new SplashScreen(bmp.IsOk() ? bmp : create_scaled_bitmap("PrusaSlicer", nullptr, 400),
@ -1320,7 +1322,7 @@ bool GUI_App::on_init_inner()
m_initialized = true; m_initialized = true;
if (const std::string& crash_reason = app_config->get("restore_win_position"); if (const std::string& crash_reason = app_config->get("restore_win_position");
crash_reason._Starts_with("crashed")) crash_reason.find_first_of("crashed") == 0)
{ {
MessageDialog dialog(mainframe, MessageDialog dialog(mainframe,
format_wxstr(_L("PrusaSlicer was crashed during a previous start due to \"%1%\".\n" format_wxstr(_L("PrusaSlicer was crashed during a previous start due to \"%1%\".\n"
@ -2968,10 +2970,12 @@ void GUI_App::window_pos_restore(wxTopLevelWindow* window, const std::string &na
if (app_config->get("restore_win_position") == "1") { if (app_config->get("restore_win_position") == "1") {
// workaround for crash related to the positioning of the window on secondary monitor // workaround for crash related to the positioning of the window on secondary monitor
app_config->set("restore_win_position", (boost::format("crashed_at_%1%_pos") % name).str()); app_config->set("restore_win_position", (boost::format("crashed_at_%1%_pos") % name).str());
app_config->save();
window->SetPosition(rect.GetPosition()); window->SetPosition(rect.GetPosition());
// workaround for crash related to the positioning of the window on secondary monitor // workaround for crash related to the positioning of the window on secondary monitor
app_config->set("restore_win_position", (boost::format("crashed_at_%1%_size") % name).str()); app_config->set("restore_win_position", (boost::format("crashed_at_%1%_size") % name).str());
app_config->save();
window->SetSize(rect.GetSize()); window->SetSize(rect.GetSize());
// revert "restore_win_position" value if application wasn't crashed // revert "restore_win_position" value if application wasn't crashed