From fe94e79fa0453fbb3af9d3261ab6487ffe0e5fdf Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Mon, 11 Apr 2022 00:55:24 +0600 Subject: [PATCH] qt: Fix crashes on failed loads of media images --- src/qt/qt_mediamenu.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/qt/qt_mediamenu.cpp b/src/qt/qt_mediamenu.cpp index 8ffccffdd..64f547272 100644 --- a/src/qt/qt_mediamenu.cpp +++ b/src/qt/qt_mediamenu.cpp @@ -338,6 +338,9 @@ void MediaMenu::floppyExportTo86f(int i) { void MediaMenu::floppyUpdateMenu(int i) { QString name = floppyfns[i]; + if (!floppyMenus.contains(i)) + return; + auto* menu = floppyMenus[i]; auto childs = menu->children(); @@ -412,6 +415,8 @@ void MediaMenu::cdromReload(int i) { void MediaMenu::cdromUpdateMenu(int i) { QString name = cdrom[i].image_path; + if (!cdromMenus.contains(i)) + return; auto* menu = cdromMenus[i]; auto childs = menu->children(); @@ -515,6 +520,8 @@ void MediaMenu::zipReload(int i) { void MediaMenu::zipUpdateMenu(int i) { QString name = zip_drives[i].image_path; QString prev_name = zip_drives[i].prev_image_path; + if (!zipMenus.contains(i)) + return; auto* menu = zipMenus[i]; auto childs = menu->children(); @@ -612,6 +619,8 @@ void MediaMenu::moReload(int i) { void MediaMenu::moUpdateMenu(int i) { QString name = mo_drives[i].image_path; QString prev_name = mo_drives[i].prev_image_path; + if (!moMenus.contains(i)) + return; auto* menu = moMenus[i]; auto childs = menu->children();