From 282ef1a9e43a62e005eee8c7506503c9f1c66fef Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 16 Jan 2006 21:41:50 +0000 Subject: [PATCH] When start is pressed or repeated, and we'd normally BeginFadingOut, we'd set bEndThisScreen to false and continue on. Instead, if we were going to set a new screen, but stopped because we're transitioning or the button was a repeat, just ignore it. This eliminates an obscure code path. --- stepmania/src/ScreenOptions.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp index cea6c0e602..a3ff73f29a 100644 --- a/stepmania/src/ScreenOptions.cpp +++ b/stepmania/src/ScreenOptions.cpp @@ -883,8 +883,9 @@ void ScreenOptions::ProcessMenuStart( const InputEventPlus &input ) bEndThisScreen = true; /* Don't accept START to go to the next screen if we're still transitioning in. */ - if( input.type != IET_FIRST_PRESS || IsTransitioning() ) - bEndThisScreen = false; + if( bEndThisScreen && + (input.type != IET_FIRST_PRESS || IsTransitioning()) ) + return; if( bEndThisScreen ) {