From fb74b65a392fe1f0bcff8dfb7ef587a7d14050ef Mon Sep 17 00:00:00 2001 From: Robbbert Date: Thu, 12 Oct 2017 22:30:38 +1100 Subject: MT 06711 --- src/frontend/mame/ui/selgame.cpp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/frontend/mame/ui/selgame.cpp b/src/frontend/mame/ui/selgame.cpp index 4a8ffd557d6..92185adfbe6 100644 --- a/src/frontend/mame/ui/selgame.cpp +++ b/src/frontend/mame/ui/selgame.cpp @@ -130,18 +130,14 @@ menu_select_game::menu_select_game(mame_ui_manager &mui, render_container &conta menu_select_game::~menu_select_game() { std::string error_string, last_driver; - game_driver const *const driver(isfavorite() ? nullptr : reinterpret_cast(get_selection_ref())); - ui_software_info *const swinfo(isfavorite() ? reinterpret_cast(get_selection_ref()) : nullptr); - - if (reinterpret_cast(driver) > skip_main_items) - last_driver = driver->name; - else if (driver && m_prev_selected) - last_driver = reinterpret_cast(m_prev_selected)->name; - - if (reinterpret_cast(swinfo) > skip_main_items) + game_driver const *driver; + ui_software_info const *swinfo; + get_selection(swinfo, driver); + if (swinfo) last_driver = swinfo->shortname; - else if (swinfo && m_prev_selected) - last_driver = reinterpret_cast(m_prev_selected)->shortname; + else + if (driver) + last_driver = driver->name; std::string filter; auto const active_filter(main_filters::filters.find(main_filters::actual)); -- cgit v1.2.3