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

[thebluegr at users.sourceforge.net]

Revision: 46668
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46668&view=rev
Author:   thebluegr
Date:     2009-12-28 10:27:56 +0000 (Mon, 28 Dec 2009)

Log Message:
-----------
SCI/new music code: Fixed a race condition when removing a sound from the playlist

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

Modified: scummvm/trunk/engines/sci/sfx/music.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/music.cpp	2009-12-28 06:24:06 UTC (rev 46667)
+++ scummvm/trunk/engines/sci/sfx/music.cpp	2009-12-28 10:27:56 UTC (rev 46668)
@@ -444,8 +444,6 @@
 }
 //---------------------------------------------
 void SciMusic::soundKill(MusicEntry *pSnd) {
-	Common::StackLock lock(_mutex);
-
 	pSnd->status = kSndStatusStopped;
 
 	if (pSnd->pMidiParser) {
@@ -458,6 +456,8 @@
 		pSnd->pStreamAud = NULL;
 	}
 
+	Common::StackLock lock(_mutex);
+
 	uint sz = _playList.size(), i;
 	// Remove sound from playlist
 	for (i = 0; i < sz; i++) {


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