From 7d9b7388c977384135cdd98fd01952f613ab590c Mon Sep 17 00:00:00 2001
From: thrust26 <tjentzsch@yahoo.de>
Date: Sat, 20 Jan 2018 18:40:25 +0100
Subject: [PATCH] ESC key exits Debugger too many keys are enabled now during
 PAUSE mode too

---
 src/emucore/EventHandler.cxx | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/emucore/EventHandler.cxx b/src/emucore/EventHandler.cxx
index 7a282657b..d5eddba17 100644
--- a/src/emucore/EventHandler.cxx
+++ b/src/emucore/EventHandler.cxx
@@ -329,7 +329,7 @@ void EventHandler::handleKeyEvent(StellaKey key, StellaMod mod, bool state)
       }
     }
     // These only work when in emulation mode
-    if(!handled && myState == EventHandlerState::EMULATION)
+    if(!handled && (myState == EventHandlerState::EMULATION || myState == EventHandlerState::PAUSE))
     {
       handled = true;
       switch(key)
@@ -539,7 +539,7 @@ void EventHandler::handleKeyEvent(StellaKey key, StellaMod mod, bool state)
       handleEvent(Event::Quit, 1);
     }
     // These only work when in emulation mode
-    else if(myState == EventHandlerState::EMULATION)
+    else if(myState == EventHandlerState::EMULATION || myState == EventHandlerState::PAUSE)
     {
       switch(key)
       {
@@ -631,13 +631,11 @@ void EventHandler::handleKeyEvent(StellaKey key, StellaMod mod, bool state)
         leaveMenuMode();
         return;
       }
-      // TODO: this currently does not work, because it exits the search dialog too
-      // How can we identify if the focus is in a different dialog?
-      /*else if(myState == EventHandlerState::DEBUGGER && !myOSystem.debugger().inMenuMode())
+      else if(myState == EventHandlerState::DEBUGGER && myOSystem.debugger().canExit())
       {
         leaveDebugMode();
         return;
-      }*/
+      }
     }
 
     // Handle keys which switch eventhandler state
@@ -1248,14 +1246,14 @@ bool EventHandler::eventStateChange(Event::Type type)
       break;
 
     case Event::OptionsMenuMode:
-      if(myState == EventHandlerState::EMULATION)
+      if(myState == EventHandlerState::EMULATION || myState == EventHandlerState::PAUSE)
         enterMenuMode(EventHandlerState::OPTIONSMENU);
       else
         handled = false;
       break;
 
     case Event::CmdMenuMode:
-      if(myState == EventHandlerState::EMULATION)
+      if(myState == EventHandlerState::EMULATION || myState == EventHandlerState::PAUSE)
         enterMenuMode(EventHandlerState::CMDMENU);
       else if(myState == EventHandlerState::CMDMENU)
         leaveMenuMode();
@@ -1264,7 +1262,7 @@ bool EventHandler::eventStateChange(Event::Type type)
       break;
 
     case Event::TimeMachineMode:
-      if(myState == EventHandlerState::EMULATION)
+      if(myState == EventHandlerState::EMULATION || myState == EventHandlerState::PAUSE)
         enterMenuMode(EventHandlerState::TIMEMACHINE);
       else if(myState == EventHandlerState::TIMEMACHINE)
         leaveMenuMode();