From 167a061b3ea74f6e2e477397e27f328121462edf Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sat, 4 Apr 2009 17:45:07 +0000 Subject: [PATCH] fix LockInputSecs not being set correctly, and pressing Start early would choose without starting SM_GoToNextScreen --- stepmania/src/ScreenSelect.cpp | 4 ++-- stepmania/src/ScreenSelectMaster.cpp | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/stepmania/src/ScreenSelect.cpp b/stepmania/src/ScreenSelect.cpp index 98ce2abb74..3c033da8a4 100644 --- a/stepmania/src/ScreenSelect.cpp +++ b/stepmania/src/ScreenSelect.cpp @@ -183,8 +183,8 @@ void ScreenSelect::HandleScreenMessage( const ScreenMessage SM ) SCREENMAN->RefreshCreditsMessages(); - if( !IsTransitioning() ) - StartTransitioningScreen( SM_GoToNextScreen ); + ASSERT( !IsTransitioning() ); + StartTransitioningScreen( SM_GoToNextScreen ); } ScreenWithMenuElements::HandleScreenMessage( SM ); diff --git a/stepmania/src/ScreenSelectMaster.cpp b/stepmania/src/ScreenSelectMaster.cpp index a062a05acf..b43d868390 100644 --- a/stepmania/src/ScreenSelectMaster.cpp +++ b/stepmania/src/ScreenSelectMaster.cpp @@ -269,9 +269,10 @@ void ScreenSelectMaster::BeginScreen() this->UpdateSelectableChoices(); - m_fLockInputSecs = this->GetTweenTimeLeft(); - ScreenSelect::BeginScreen(); + + // Call GetTweenTimeLeft after the base BeginScreen has started the in Transition. + m_fLockInputSecs = this->GetTweenTimeLeft(); } void ScreenSelectMaster::HandleScreenMessage( const ScreenMessage SM )