From cc24a339d8c0517259084b5c178d784626ba965c Mon Sep 17 00:00:00 2001 From: ImJezze Date: Sun, 21 Feb 2016 11:48:45 +0100 Subject: Merge remote-tracking branch 'refs/remotes/mamedev/master' Second attempt --- src/emu/ui/sliders.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/emu/ui/sliders.cpp') diff --git a/src/emu/ui/sliders.cpp b/src/emu/ui/sliders.cpp index 26da6327202..e494213aa1b 100644 --- a/src/emu/ui/sliders.cpp +++ b/src/emu/ui/sliders.cpp @@ -108,14 +108,14 @@ void ui_menu_sliders::handle() /* if we got here via up or page up, select the previous item */ if (menu_event->iptkey == IPT_UI_UP || menu_event->iptkey == IPT_UI_PAGE_UP) { - selected = (selected + numitems - 1) % numitems; + selected = (selected + item.size() - 1) % item.size(); validate_selection(-1); } /* otherwise select the next item */ else if (menu_event->iptkey == IPT_UI_DOWN || menu_event->iptkey == IPT_UI_PAGE_DOWN) { - selected = (selected + 1) % numitems; + selected = (selected + 1) % item.size(); validate_selection(1); } } @@ -242,7 +242,7 @@ UINT32 ui_menu_sliders::ui_handler(running_machine &machine, render_container *c /* if this is the first call, push the sliders menu */ if (state) - ui_menu::stack_push(auto_alloc_clear(machine, (machine, container, true))); + ui_menu::stack_push(global_alloc_clear(machine, container, true)); /* handle standard menus */ result = ui_menu::ui_handler(machine, container, state); -- cgit v1.2.3-70-g09d2