From 33756b248100c121c3fc8cebac9be032bdeb7ace Mon Sep 17 00:00:00 2001 From: thrust26 Date: Mon, 5 Feb 2018 13:39:13 +0100 Subject: [PATCH] fixed a little merge error --- src/emucore/EventHandler.cxx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/emucore/EventHandler.cxx b/src/emucore/EventHandler.cxx index bd1316f07..0a49ff6c8 100644 --- a/src/emucore/EventHandler.cxx +++ b/src/emucore/EventHandler.cxx @@ -301,19 +301,19 @@ void EventHandler::handleKeyEvent(StellaKey key, StellaMod mod, bool state) { case KBDK_LEFT: // Alt-left(-shift) rewinds 1(10) states enterTimeMachineMenuMode((StellaModTest::isShift(mod) && state) ? 10 : 1, false); - return; + break; case KBDK_RIGHT: // Alt-right(-shift) unwinds 1(10) states enterTimeMachineMenuMode((StellaModTest::isShift(mod) && state) ? 10 : 1, true); - return; + break; case KBDK_DOWN: // Alt-down rewinds to start of list enterTimeMachineMenuMode(1000, false); - return; + break; case KBDK_UP: // Alt-up rewinds to end of list enterTimeMachineMenuMode(1000, true); - return; + break; // These can work in pause mode too case KBDK_EQUALS: @@ -2151,8 +2151,6 @@ void EventHandler::enterTimeMachineMenuMode(uInt32 numWinds, bool unwind) // add one extra state if we are in Time Machine mode // TODO: maybe remove this state if we leave the menu at this new state myOSystem.state().addExtraState("enter Time Machine dialog"); // force new state - if(numWinds) - myOSystem.state().windStates(numWinds, unwind); if(numWinds) myOSystem.state().windStates(numWinds, unwind);