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

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Tue May 25 17:38:31 CEST 2010


Revision: 49214
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49214&view=rev
Author:   m_kiewitz
Date:     2010-05-25 15:38:30 +0000 (Tue, 25 May 2010)

Log Message:
-----------
SCI: dont lock mutex in pauseAll(), isn't needed anyway - fixes deadlock in sq4

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-05-25 12:53:35 UTC (rev 49213)
+++ scummvm/trunk/engines/sci/sound/music.cpp	2010-05-25 15:38:30 UTC (rev 49214)
@@ -115,8 +115,6 @@
 }
 
 void SciMusic::pauseAll(bool pause) {
-	Common::StackLock lock(_mutex);
-
 	const MusicList::iterator end = _playList.end();
 	for (MusicList::iterator i = _playList.begin(); i != end; ++i) {
 		soundToggle(*i, pause);


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