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

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Tue May 11 18:15:21 CEST 2010


Revision: 49006
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49006&view=rev
Author:   m_kiewitz
Date:     2010-05-11 16:15:21 +0000 (Tue, 11 May 2010)

Log Message:
-----------
SCI: remove unneeded _mutex lock to fix deadlock issue

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

Modified: scummvm/trunk/engines/sci/sound/soundcmd.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/soundcmd.cpp	2010-05-11 15:41:31 UTC (rev 49005)
+++ scummvm/trunk/engines/sci/sound/soundcmd.cpp	2010-05-11 16:15:21 UTC (rev 49006)
@@ -557,7 +557,6 @@
 
 		_music->pauseAll(value);
 	} else {	// pause a playlist slot
-		Common::StackLock lock(_music->_mutex);
 		MusicEntry *musicSlot = _music->getSlot(obj);
 		if (!musicSlot) {
 			warning("cmdPauseSound: Slot not found (%04x:%04x)", PRINT_REG(obj));


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




More information about the Scummvm-git-logs mailing list