From b465a7bcc7a90a7739a703ca2ac040c227cd970e Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Mon, 7 Sep 2009 09:30:39 +0200 Subject: [PATCH] Do not use wxMenu::Remove() with menu items that aren't present. Otherwise wxWidgets debug builds assert on mmg startup. Patch by Vaclav Slavik . --- src/mmg/mmg_dialog.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mmg/mmg_dialog.cpp b/src/mmg/mmg_dialog.cpp index 96ca216f7..df0ac6aa5 100644 --- a/src/mmg/mmg_dialog.cpp +++ b/src/mmg/mmg_dialog.cpp @@ -1066,9 +1066,9 @@ mmg_dialog::update_file_menu() { wxString s; for (i = ID_M_FILE_LOADLAST1; i <= ID_M_FILE_LOADLAST4; i++) { - mi = file_menu->Remove(i); + mi = file_menu->FindItem(i); if (mi != NULL) - delete mi; + file_menu->Destroy(mi); } if ((last_settings.size() > 0) && !file_menu_sep) { @@ -1088,9 +1088,9 @@ mmg_dialog::update_chapter_menu() { wxString s; for (i = ID_M_CHAPTERS_LOADLAST1; i <= ID_M_CHAPTERS_LOADLAST4; i++) { - mi = chapter_menu->Remove(i); + mi = chapter_menu->FindItem(i); if (mi != NULL) - delete mi; + chapter_menu->Destroy(mi); } if ((last_chapters.size() > 0) && !chapter_menu_sep) {