From a0cf52df6569c42e72cbc06a65d042191fd97fe9 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 14 Jul 2003 23:56:11 +0000 Subject: [PATCH] Fix music not stopping while spinning the wheel --- stepmania/src/ScreenSelectMusic.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 07d0b246ec..5ca86f4ce9 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -844,11 +844,15 @@ void ScreenSelectMusic::AfterMusicChange() case TYPE_SONG: { // Don't stop music if it's already playing the right file. -// SOUNDMAN->StopMusic(); - m_fPlaySampleCountdown = SAMPLE_MUSIC_DELAY; - m_sSampleMusicToPlay = pSong->GetMusicPath(); - m_fSampleStartSeconds = pSong->m_fMusicSampleStartSeconds; - m_fSampleLengthSeconds = pSong->m_fMusicSampleLengthSeconds; + if( SOUNDMAN->GetMusicPath() != pSong->GetMusicPath() ) + { + SOUNDMAN->StopMusic(); + + m_fPlaySampleCountdown = SAMPLE_MUSIC_DELAY; + m_sSampleMusicToPlay = pSong->GetMusicPath(); + m_fSampleStartSeconds = pSong->m_fMusicSampleStartSeconds; + m_fSampleLengthSeconds = pSong->m_fMusicSampleLengthSeconds; + } for( int pn = 0; pn < NUM_PLAYERS; ++pn) {