From 26f30a12a5b667acf023e7a87bd7e693b1db9574 Mon Sep 17 00:00:00 2001 From: jflatt Date: Fri, 15 Jul 2022 08:53:17 -0700 Subject: ui/selgame.cpp, ui/selsoft.cpp: Clear up std::vector asserts triggered when menu items is empty. (#10085) --- src/frontend/mame/ui/selgame.cpp | 2 +- src/frontend/mame/ui/selsoft.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/frontend/mame/ui/selgame.cpp b/src/frontend/mame/ui/selgame.cpp index 07b8d03d043..bcdd49239cc 100644 --- a/src/frontend/mame/ui/selgame.cpp +++ b/src/frontend/mame/ui/selgame.cpp @@ -442,7 +442,7 @@ void menu_select_game::populate(float &customtop, float &custombottom) item_append(_("System Settings"), 0, (void *)(uintptr_t)CONF_MACHINE); skip_main_items = 3; - if (m_prev_selected && !have_prev_selected) + if (m_prev_selected && !have_prev_selected && item_count() > 0) m_prev_selected = item(0).ref(); } else diff --git a/src/frontend/mame/ui/selsoft.cpp b/src/frontend/mame/ui/selsoft.cpp index da4ad722f2f..051b09b4fcf 100644 --- a/src/frontend/mame/ui/selsoft.cpp +++ b/src/frontend/mame/ui/selsoft.cpp @@ -397,7 +397,7 @@ menu_select_software::~menu_select_software() void menu_select_software::handle(event const *ev) { - if (m_prev_selected == nullptr) + if (m_prev_selected == nullptr && item_count() > 0) m_prev_selected = item(0).ref(); // FIXME: everything above here used run before events were processed -- cgit v1.2.3