From 7d7305f20e7112b5f2b977ca8b8fba035e787125 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 17 Jun 2004 07:38:12 +0000 Subject: [PATCH] fix glitch when in "ASK" song options mode and start is pressed before m_In finishes --- stepmania/src/ScreenOptions.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp index 005cd72392..6ef35a42c9 100644 --- a/stepmania/src/ScreenOptions.cpp +++ b/stepmania/src/ScreenOptions.cpp @@ -1173,7 +1173,8 @@ void ScreenOptions::MenuStart( PlayerNumber pn, const InputEventType type ) if( GAMESTATE->IsHumanPlayer(p) && m_Rows[m_iCurrentRow[p]]->Type != Row::ROW_EXIT ) bAllOnExit = false; - if( bAllOnExit && type == IET_FIRST_PRESS ) + /* Don't accept START to go to the next screen if we're still transitioning in. */ + if( bAllOnExit && type == IET_FIRST_PRESS && !IsTransitioning() ) StartGoToNextState(); return; } @@ -1232,7 +1233,8 @@ void ScreenOptions::MenuStart( PlayerNumber pn, const InputEventType type ) break; case NAV_THREE_KEY_MENU: case NAV_FIVE_KEY: - if( type == IET_FIRST_PRESS ) // m_SMOptionsNavigation + /* Don't accept START to go to the next screen if we're still transitioning in. */ + if( type == IET_FIRST_PRESS && !IsTransitioning() ) // m_SMOptionsNavigation StartGoToNextState(); break; }