From 6c2a0f02d54dd2d8fe1f54c0f16d35bf024ab96c Mon Sep 17 00:00:00 2001 From: thrust26 Date: Fri, 3 May 2019 19:34:39 +0200 Subject: [PATCH] prevent exiting command dialog with toggle key when using minimal UI --- src/emucore/EventHandler.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/emucore/EventHandler.cxx b/src/emucore/EventHandler.cxx index 9ae8a48c7..bccaa9807 100644 --- a/src/emucore/EventHandler.cxx +++ b/src/emucore/EventHandler.cxx @@ -664,7 +664,9 @@ bool EventHandler::changeStateByEvent(Event::Type type) case Event::CmdMenuMode: if(myState == EventHandlerState::EMULATION || myState == EventHandlerState::PAUSE) enterMenuMode(EventHandlerState::CMDMENU); - else if(myState == EventHandlerState::CMDMENU) + else if(myState == EventHandlerState::CMDMENU && !myOSystem.settings().getBool("minimal_ui")) + // The extra check for "minimal_ui" allows mapping e.g. right joystick fire + // to open the command dialog and navigate there using that fire button leaveMenuMode(); else handled = false;