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

Fixed a crash when switching between tabs

Browse source 
Introduced in ba963ac
This commit is contained in:
Lukas Matena 2020-06-02 11:42:22 +02:00
parent 06a8bfa588
commit a4d30fc9bb
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/slic3r/GUI/MainFrame.cpp
View file

@ -325,21 +325,22 @@ void MainFrame::init_tabpanel()
} }
m_tabpanel->Bind(wxEVT_NOTEBOOK_PAGE_CHANGED, [this](wxEvent&) { m_tabpanel->Bind(wxEVT_NOTEBOOK_PAGE_CHANGED, [this](wxEvent&) {
auto panel = m_tabpanel->GetCurrentPage(); wxWindow* panel = m_tabpanel->GetCurrentPage();
Tab* tab = dynamic_cast<Tab*>(panel);
// There shouldn't be a case, when we try to select a tab, which doesn't support a printer technology // There shouldn't be a case, when we try to select a tab, which doesn't support a printer technology
if (panel == nullptr || !static_cast<Tab*>(panel)->supports_printer_technology(m_plater->printer_technology())) if (panel == nullptr || (tab && tab->supports_printer_technology(m_plater->printer_technology())))
return; return;
auto& tabs_list = wxGetApp().tabs_list; auto& tabs_list = wxGetApp().tabs_list;
if (find(tabs_list.begin(), tabs_list.end(), panel) != tabs_list.end()) { if (tab && std::find(tabs_list.begin(), tabs_list.end(), tab) != tabs_list.end()) {
// On GTK, the wxEVT_NOTEBOOK_PAGE_CHANGED event is triggered // On GTK, the wxEVT_NOTEBOOK_PAGE_CHANGED event is triggered
// before the MainFrame is fully set up. // before the MainFrame is fully set up.
static_cast<Tab*>(panel)->OnActivate(); tab->OnActivate();
m_last_selected_tab = m_tabpanel->GetSelection(); m_last_selected_tab = m_tabpanel->GetSelection();
} }
else else
select_tab(0); select_tab(0); // select Plater
}); });
if (m_layout == slOld) { if (m_layout == slOld) {