From 3189fe4a329ce5d762f8e396d188117f42325fa9 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sun, 18 Jul 2010 16:25:23 +0000
Subject: SCI: change to r50995 - better stop fading when stop is called

svn-id: r50996
---
 engines/sci/sound/music.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index 533bee8170..f359d5de93 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -388,7 +388,6 @@ void SciMusic::soundPlay(MusicEntry *pSnd) {
 		}
 	}
 
-	pSnd->fadeStep = 0; // just make sure that previous fading isn't continued
 	pSnd->status = kSoundPlaying;
 }
 
@@ -411,6 +410,8 @@ void SciMusic::soundStop(MusicEntry *pSnd) {
 		pSnd->pMidiParser->mainThreadEnd();
 		_mutex.unlock();
 	}
+
+	pSnd->fadeStep = 0; // end fading, if fading was in progress
 }
 
 void SciMusic::soundSetVolume(MusicEntry *pSnd, byte volume) {
-- 
cgit v1.2.3