From 40615be9be2557312217f68e953d7886c8098a36 Mon Sep 17 00:00:00 2001 From: thrust26 Date: Sat, 20 Jan 2018 21:48:24 +0100 Subject: [PATCH] Revert "fix repeated ESC from debugger", there is a more fundamental problem This reverts commit 1b5ac9d3b516669e346c4509ad146eaddd8b0674. --- src/emucore/EventHandler.cxx | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/emucore/EventHandler.cxx b/src/emucore/EventHandler.cxx index 8c3f322d7..d5eddba17 100644 --- a/src/emucore/EventHandler.cxx +++ b/src/emucore/EventHandler.cxx @@ -618,21 +618,18 @@ void EventHandler::handleKeyEvent(StellaKey key, StellaMod mod, bool state) if(!(StellaModTest::isControl(mod) || StellaModTest::isShift(mod) || StellaModTest::isAlt(mod))) { // special handling for Escape key - if(key == KBDK_ESCAPE) + if(state && key == KBDK_ESCAPE) { - if(state) + if(myState == EventHandlerState::PAUSE) { - if(myState == EventHandlerState::PAUSE) - { - setEventState(EventHandlerState::EMULATION); - return; - } - else if(myState == EventHandlerState::CMDMENU || - myState == EventHandlerState::TIMEMACHINE) - { - leaveMenuMode(); - return; - } + setEventState(EventHandlerState::EMULATION); + return; + } + else if(myState == EventHandlerState::CMDMENU || + myState == EventHandlerState::TIMEMACHINE) + { + leaveMenuMode(); + return; } else if(myState == EventHandlerState::DEBUGGER && myOSystem.debugger().canExit()) {