From ad16ea6827a1f7f184c02ac0d1263e48335e88c6 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sat, 3 Jan 2004 20:13:51 +0000 Subject: [PATCH] fix back and out transitions can play at the same time --- stepmania/src/ScreenCaution.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/stepmania/src/ScreenCaution.cpp b/stepmania/src/ScreenCaution.cpp index d52be3db13..0b747109ca 100644 --- a/stepmania/src/ScreenCaution.cpp +++ b/stepmania/src/ScreenCaution.cpp @@ -68,7 +68,7 @@ void ScreenCaution::HandleScreenMessage( const ScreenMessage SM ) switch( SM ) { case SM_StartClosing: - if( !m_In.IsTransitioning() && !m_Out.IsTransitioning() ) + if( !m_In.IsTransitioning() && !m_Out.IsTransitioning() && !m_Back.IsTransitioning() ) { m_Background.PlayOffCommand(); m_Out.StartTransitioning( SM_GoToNextScreen ); @@ -90,11 +90,10 @@ void ScreenCaution::HandleScreenMessage( const ScreenMessage SM ) void ScreenCaution::MenuStart( PlayerNumber pn ) { - if( !m_In.IsTransitioning() && !m_Out.IsTransitioning() ) - { - m_Background.PlayOffCommand(); - m_Out.StartTransitioning( SM_GoToNextScreen ); - } + if( m_In.IsTransitioning() || m_Out.IsTransitioning() || m_Back.IsTransitioning() ) + return; + m_Background.PlayOffCommand(); + m_Out.StartTransitioning( SM_GoToNextScreen ); } void ScreenCaution::MenuBack( PlayerNumber pn )