ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "fix repeated ESC from debugger", there is a more fundamental problem 

This reverts commit 1b5ac9d3b5.
This commit is contained in:
thrust26 2018-01-20 21:48:24 +01:00
parent b3e582209f
commit 40615be9be
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/emucore/EventHandler.cxx
View File

@ -618,21 +618,18 @@ void EventHandler::handleKeyEvent(StellaKey key, StellaMod mod, bool state)
if(!(StellaModTest::isControl(mod) || StellaModTest::isShift(mod) || StellaModTest::isAlt(mod))) if(!(StellaModTest::isControl(mod) || StellaModTest::isShift(mod) || StellaModTest::isAlt(mod)))
{ {
// special handling for Escape key // 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;
setEventState(EventHandlerState::EMULATION); }
return; else if(myState == EventHandlerState::CMDMENU ||
} myState == EventHandlerState::TIMEMACHINE)
else if(myState == EventHandlerState::CMDMENU || {
myState == EventHandlerState::TIMEMACHINE) leaveMenuMode();
{ return;
leaveMenuMode();
return;
}
} }
else if(myState == EventHandlerState::DEBUGGER && myOSystem.debugger().canExit()) else if(myState == EventHandlerState::DEBUGGER && myOSystem.debugger().canExit())
{ {