From 74799ade143e2f85e4a306ce6303e6e47fe5707a Mon Sep 17 00:00:00 2001
From: Lukas Matena <lukasmatena@seznam.cz>
Date: Fri, 21 Feb 2020 10:02:41 +0100
Subject: [PATCH] Fixed two cases of crashes on application close Both related
to ObjectList - it was attempting to call plater after it was destroyed
Approved by @YuSanka
---
src/slic3r/GUI/GUI_ObjectList.cpp | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp
index a5566de29..f5f554830 100644
--- a/src/slic3r/GUI/GUI_ObjectList.cpp
+++ b/src/slic3r/GUI/GUI_ObjectList.cpp
@@ -77,7 +77,9 @@ static int extruders_count()
static void take_snapshot(const wxString& snapshot_name)
{
- wxGetApp().plater()->take_snapshot(snapshot_name);
+ Plater* plater = wxGetApp().plater();
+ if (plater)
+ plater->take_snapshot(snapshot_name);
}
ObjectList::ObjectList(wxWindow* parent) :
@@ -3931,7 +3933,9 @@ void ObjectList::OnEditingDone(wxDataViewEvent &event)
m_last_selected_column = -1;
#endif //__WXMSW__
- wxGetApp().plater()->set_current_canvas_as_dirty();
+ Plater* plater = wxGetApp().plater();
+ if (plater)
+ plater->set_current_canvas_as_dirty();
}
void ObjectList::show_multi_selection_menu()