From 10b0287c9d8530d29b8f29aedb277163a3520130 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 20 Aug 2002 08:29:55 +0000 Subject: [PATCH] Don't allow cancelling ScreenCaution while i''s already in the process of being cancelled. (Other screens have this problem, too ...) --- stepmania/src/ScreenCaution.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/stepmania/src/ScreenCaution.cpp b/stepmania/src/ScreenCaution.cpp index 3b8a67280c..202903723c 100644 --- a/stepmania/src/ScreenCaution.cpp +++ b/stepmania/src/ScreenCaution.cpp @@ -45,7 +45,7 @@ ScreenCaution::ScreenCaution() m_FadeWipe.SetOpened(); this->AddSubActor( &m_FadeWipe ); - this->SendScreenMessage( SM_StartClosing, 3 ); + this->SendScreenMessage( SM_StartClosing, 1 ); } @@ -97,6 +97,8 @@ void ScreenCaution::MenuStart( const PlayerNumber p ) void ScreenCaution::MenuBack( const PlayerNumber p ) { + if(m_FadeWipe.IsClosing()) + return; this->ClearMessageQueue(); m_FadeWipe.CloseWipingLeft( SM_GoToPrevState ); SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","menu back") );