From db22dcf5e0d78b7c000b98c4eeb6dd2efd143dc2 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 20 Jul 2005 05:02:56 +0000 Subject: [PATCH] common code --- stepmania/src/ScreenEdit.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp index c0ec4e90b8..370ddee07f 100644 --- a/stepmania/src/ScreenEdit.cpp +++ b/stepmania/src/ScreenEdit.cpp @@ -1718,6 +1718,9 @@ void ScreenEdit::TransitionEditState( EditState em ) { EditState old = m_EditState; + /* If we're playing sample music when changing modes, stop it. */ + SOUND->PlayMusic(""); + if( old == STATE_PLAYING ) { if( GAMESTATE->IsSyncDataChanged() ) @@ -2487,8 +2490,6 @@ void ScreenEdit::HandleAreaMenuChoice( AreaMenuChoice c, const vector &iAns { ASSERT( m_NoteFieldEdit.m_iBeginMarker!=-1 && m_NoteFieldEdit.m_iEndMarker!=-1 ); - SOUND->PlayMusic(""); - TransitionEditState( STATE_PLAYING ); m_sprOverlay->PlayCommand( "Play" ); @@ -2539,8 +2540,6 @@ void ScreenEdit::HandleAreaMenuChoice( AreaMenuChoice c, const vector &iAns { ASSERT( m_NoteFieldEdit.m_iBeginMarker!=-1 && m_NoteFieldEdit.m_iEndMarker!=-1 ); - SOUND->PlayMusic(""); - TransitionEditState( STATE_RECORDING ); m_sprOverlay->PlayCommand( "Record" ); GAMESTATE->m_bPastHereWeGo = true;