[Scummvm-cvs-logs] SF.net SVN: scummvm:[50996] scummvm/trunk/engines/sci/sound/music.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 50996
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50996&view=rev
Author:   m_kiewitz
Date:     2010-07-18 16:25:23 +0000 (Sun, 18 Jul 2010)

Log Message:
-----------
SCI: change to r50995 - better stop fading when stop is called

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sound/music.cpp

Modified: scummvm/trunk/engines/sci/sound/music.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/music.cpp	2010-07-18 16:22:16 UTC (rev 50995)
+++ scummvm/trunk/engines/sci/sound/music.cpp	2010-07-18 16:25:23 UTC (rev 50996)
@@ -388,7 +388,6 @@
 		}
 	}
 
-	pSnd->fadeStep = 0; // just make sure that previous fading isn't continued
 	pSnd->status = kSoundPlaying;
 }
 
@@ -411,6 +410,8 @@
 		pSnd->pMidiParser->mainThreadEnd();
 		_mutex.unlock();
 	}
+
+	pSnd->fadeStep = 0; // end fading, if fading was in progress
 }
 
 void SciMusic::soundSetVolume(MusicEntry *pSnd, byte volume) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.