aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/sound
diff options
context:
space:
mode:
authorMartin Kiewitz2010-05-25 15:38:30 +0000
committerMartin Kiewitz2010-05-25 15:38:30 +0000
commit849cfe4f0e5793caf648cb8fb030698c88c622f5 (patch)
tree4845e8c17fa856c84878e33058fe613a78514a87 /engines/sci/sound
parent2502038e73e19dd5cf819834369fffa6e86caa7d (diff)
downloadscummvm-rg350-849cfe4f0e5793caf648cb8fb030698c88c622f5.tar.gz
scummvm-rg350-849cfe4f0e5793caf648cb8fb030698c88c622f5.tar.bz2
scummvm-rg350-849cfe4f0e5793caf648cb8fb030698c88c622f5.zip
SCI: dont lock mutex in pauseAll(), isn't needed anyway - fixes deadlock in sq4
svn-id: r49214
Diffstat (limited to 'engines/sci/sound')
-rw-r--r--engines/sci/sound/music.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index 86c7669df9..a623c0b4d2 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -115,8 +115,6 @@ void SciMusic::clearPlayList() {
}
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);