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

Fixed crashes if OnIdle handler was called before Plater was initialized.

Browse source
This commit is contained in:
bubnikv 2019-03-11 11:03:13 +01:00
parent c74fe8acb8
commit 6811c68f60
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -161,12 +161,15 @@ bool GUI_App::OnInit()
Bind(wxEVT_IDLE, [this](wxIdleEvent& event) Bind(wxEVT_IDLE, [this](wxIdleEvent& event)
{ {
if (! plater_)
return;
if (app_config->dirty() && app_config->get("autosave") == "1") if (app_config->dirty() && app_config->get("autosave") == "1")
app_config->save(); app_config->save();
// ! Temporary workaround for the correct behavior of the Scrolled sidebar panel // ! Temporary workaround for the correct behavior of the Scrolled sidebar panel
// Do this "manipulations" only once ( after (re)create of the application ) // Do this "manipulations" only once ( after (re)create of the application )
if (plater_ && sidebar().obj_list()->GetMinHeight() > 15 * wxGetApp().em_unit()) if (sidebar().obj_list()->GetMinHeight() > 15 * wxGetApp().em_unit())
{ {
wxWindowUpdateLocker noUpdates_sidebar(&sidebar()); wxWindowUpdateLocker noUpdates_sidebar(&sidebar());
sidebar().obj_list()->SetMinSize(wxSize(-1, 15 * wxGetApp().em_unit())); sidebar().obj_list()->SetMinSize(wxSize(-1, 15 * wxGetApp().em_unit()));
@ -175,8 +178,7 @@ bool GUI_App::OnInit()
update_mode(); // update view mode after fix of the object_list size update_mode(); // update view mode after fix of the object_list size
} }
if (this->plater() != nullptr) this->obj_manipul()->update_if_dirty();
this->obj_manipul()->update_if_dirty();
// Preset updating & Configwizard are done after the above initializations, // Preset updating & Configwizard are done after the above initializations,
// and after MainFrame is created & shown. // and after MainFrame is created & shown.