summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/ui/menu.cpp
diff options
context:
space:
mode:
author dankan1890 <mewuidev2@gmail.com>2016-04-07 12:36:30 +0200
committer dankan1890 <mewuidev2@gmail.com>2016-04-07 12:36:30 +0200
commitb10ffebf58b06c45cc9c70a46471c717175be965 (patch)
tree416fced73ed677597f87080863849f7b46c23328 /src/emu/ui/menu.cpp
parent0386367805a78c83a8e1719c1c4193f15a12e377 (diff)
Fixed the key handler for the error "roms or missing CHD."
Removed the delay in showing the description in the Advanced menu. Synchronized the translation files.
Diffstat (limited to 'src/emu/ui/menu.cpp')
-rw-r--r--src/emu/ui/menu.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/emu/ui/menu.cpp b/src/emu/ui/menu.cpp
index bcf231724d4..335668fb417 100644
--- a/src/emu/ui/menu.cpp
+++ b/src/emu/ui/menu.cpp
@@ -1724,10 +1724,8 @@ void ui_menu::handle_main_keys(UINT32 flags)
// hitting cancel also pops the stack
if (exclusive_input_pressed(IPT_UI_CANCEL, 0))
{
- if (!menu_has_search_active())
+ if (!ui_error && !menu_has_search_active())
ui_menu::stack_pop(machine());
- // else if (!ui_error)
- // ui_menu::stack_pop(machine()); TODO
return;
}