GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-05-07 03:29:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix of New assertion failure with 2.0.0rc #2250

Browse Source 
Calls to Dialog::Close() after Dialog::EndModal() were removed.
This commit is contained in:
bubnikv 2019-05-16 16:06:57 +02:00
parent df19314645
commit 57a7425b0f
6 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/slic3r/GUI/AboutDialog.cpp
View File

@ -163,7 +163,6 @@ void AboutDialog::onLinkClicked(wxHtmlLinkEvent &event)
void AboutDialog::onCloseDialog(wxEvent &) void AboutDialog::onCloseDialog(wxEvent &)
{ {
this->EndModal(wxID_CLOSE); this->EndModal(wxID_CLOSE);
this->Close();
} }
} // namespace GUI } // namespace GUI

2
src/slic3r/GUI/ConfigSnapshotDialog.cpp
View File

@ -159,13 +159,11 @@ void ConfigSnapshotDialog::onLinkClicked(wxHtmlLinkEvent &event)
{ {
m_snapshot_to_activate = event.GetLinkInfo().GetHref(); m_snapshot_to_activate = event.GetLinkInfo().GetHref();
this->EndModal(wxID_CLOSE); this->EndModal(wxID_CLOSE);
this->Close();
} }
void ConfigSnapshotDialog::onCloseDialog(wxEvent &) void ConfigSnapshotDialog::onCloseDialog(wxEvent &)
{ {
this->EndModal(wxID_CLOSE); this->EndModal(wxID_CLOSE);
this->Close();
} }
} // namespace GUI } // namespace GUI

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

@ -442,14 +442,12 @@ void GUI_App::system_info()
{ {
SysInfoDialog dlg; SysInfoDialog dlg;
dlg.ShowModal(); dlg.ShowModal();
dlg.Destroy();
} }
void GUI_App::keyboard_shortcuts() void GUI_App::keyboard_shortcuts()
{ {
KBShortcutsDialog dlg; KBShortcutsDialog dlg;
dlg.ShowModal(); dlg.ShowModal();
dlg.Destroy();
} }
// static method accepting a wxWindow object as first parameter // static method accepting a wxWindow object as first parameter

1
src/slic3r/GUI/KBShortcutsDialog.cpp
View File

@ -211,7 +211,6 @@ void KBShortcutsDialog::on_dpi_changed(const wxRect &suggested_rect)
void KBShortcutsDialog::onCloseDialog(wxEvent &) void KBShortcutsDialog::onCloseDialog(wxEvent &)
{ {
this->EndModal(wxID_CLOSE); this->EndModal(wxID_CLOSE);
this->Close();
} }
} // namespace GUI } // namespace GUI

1
src/slic3r/GUI/Preferences.cpp
View File

@ -136,7 +136,6 @@ void PreferencesDialog::accept()
} }
EndModal(wxID_OK); EndModal(wxID_OK);
Close(); // needed on Linux
// Nothify the UI to update itself from the ini file. // Nothify the UI to update itself from the ini file.
wxGetApp().update_ui_from_settings(); wxGetApp().update_ui_from_settings();

3
src/slic3r/GUI/SysInfoDialog.cpp
View File

@ -117,7 +117,7 @@ SysInfoDialog::SysInfoDialog()
} }
wxStdDialogButtonSizer* buttons = this->CreateStdDialogButtonSizer(wxOK); wxStdDialogButtonSizer* buttons = this->CreateStdDialogButtonSizer(wxOK);
m_btn_copy_to_clipboard = new wxButton(this, wxID_ANY, "Copy to Clipboard", wxDefaultPosition, wxDefaultSize); m_btn_copy_to_clipboard = new wxButton(this, wxID_ANY, _(L("Copy to Clipboard")), wxDefaultPosition, wxDefaultSize);
buttons->Insert(0, m_btn_copy_to_clipboard, 0, wxLEFT, 5); buttons->Insert(0, m_btn_copy_to_clipboard, 0, wxLEFT, 5);
m_btn_copy_to_clipboard->Bind(wxEVT_BUTTON, &SysInfoDialog::onCopyToClipboard, this); m_btn_copy_to_clipboard->Bind(wxEVT_BUTTON, &SysInfoDialog::onCopyToClipboard, this);
@ -172,7 +172,6 @@ void SysInfoDialog::onCopyToClipboard(wxEvent &)
void SysInfoDialog::onCloseDialog(wxEvent &) void SysInfoDialog::onCloseDialog(wxEvent &)
{ {
this->EndModal(wxID_CLOSE); this->EndModal(wxID_CLOSE);
this->Close();
} }
} // namespace GUI } // namespace GUI