diff options
Diffstat (limited to 'src/emu/ui/selsoft.cpp')
-rw-r--r-- | src/emu/ui/selsoft.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/emu/ui/selsoft.cpp b/src/emu/ui/selsoft.cpp index fc3d21b550d..5d1acb27c34 100644 --- a/src/emu/ui/selsoft.cpp +++ b/src/emu/ui/selsoft.cpp @@ -19,7 +19,6 @@ #include "ui/datfile.h" #include "ui/inifile.h" #include "ui/selector.h" -#include "ui/custmenu.h" #include "rendfont.h" #include "rendutil.h" #include "softlist.h" @@ -416,8 +415,7 @@ void ui_menu_select_software::populate() if (reselect_last::software == "[Start empty]" && !reselect_last::driver.empty()) old_software = 0; - else if (!reselect_last::software.empty() && m_displaylist[curitem]->shortname == reselect_last::software - && m_displaylist[curitem]->listname == reselect_last::swlist) + else if (m_displaylist[curitem]->shortname == reselect_last::software && m_displaylist[curitem]->listname == reselect_last::swlist) old_software = m_has_empty_start ? curitem + 1 : curitem; item_append(m_displaylist[curitem]->longname.c_str(), m_displaylist[curitem]->devicetype.c_str(), @@ -822,7 +820,7 @@ void ui_menu_select_software::inkey_select(const ui_menu_event *m_event) if (ui_swinfo->startempty == 1) { std::vector<s_bios> biosname; - if (has_multiple_bios(ui_swinfo->driver, biosname) && !mopt.skip_bios_menu()) + if (!mopt.skip_bios_menu() && has_multiple_bios(ui_swinfo->driver, biosname)) ui_menu::stack_push(global_alloc_clear<ui_bios_selection>(machine(), container, biosname, (void *)ui_swinfo->driver, false, true)); else { @@ -1479,8 +1477,7 @@ void ui_menu_select_software::infos_render(void *selectedref, float origx1, floa return; } else - mui.wrap_text(container, buffer.c_str(), origx1, origy1, origx2 - origx1 - (2.0f * gutter_width), totallines, - xstart, xend, text_size); + totallines = mui.wrap_text(container, buffer.c_str(), origx1, origy1, origx2 - origx1 - (2.0f * gutter_width), xstart, xend, text_size); int r_visible_lines = floor((origy2 - oy1) / (line_height * text_size)); if (totallines < r_visible_lines) |