Fixed OSX/Linux build

Destroy Settings Dialog when close application
This commit is contained in:
YuSanka 2020-05-05 09:35:28 +02:00
parent 53516c8086
commit 43be7a51aa
3 changed files with 9 additions and 3 deletions

View file

@ -231,6 +231,9 @@ void MainFrame::shutdown()
// In addition, there were some crashes due to the Paint events sent to already destructed windows.
this->Show(false);
if (m_settings_dialog)
m_settings_dialog->Destroy();
// Stop the background thread (Windows and Linux).
// Disconnect from a 3DConnextion driver (OSX).
m_plater->get_mouse3d_controller().shutdown();
@ -295,6 +298,9 @@ void MainFrame::init_tabpanel()
wxGetApp().app_config->get("new_settings_layout_mode") == "1" ? slNew :
wxGetApp().app_config->get("dlg_settings_layout_mode") == "1" ? slDlg : slOld;
// From the very beginning the Print settings should be selected
m_last_selected_tab = m_layout == slDlg ? 0 : 1;
if (m_layout == slDlg) {
m_settings_dialog = new SettingsDialog();
m_tabpanel = m_settings_dialog->get_tabpanel();