aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/sound
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2014-10-07 21:24:49 +0200
committerWillem Jan Palenstijn2015-02-15 13:57:03 +0100
commit5964cc239b920a4a5d3b8475cb6c0b111e968e03 (patch)
tree76c334fe1802bda79f467dfb67fca7c7ffd9bcb2 /engines/sci/sound
parent58ef44eb8d9d3eb78eb013441a8d6d12940ee5e3 (diff)
downloadscummvm-rg350-5964cc239b920a4a5d3b8475cb6c0b111e968e03.tar.gz
scummvm-rg350-5964cc239b920a4a5d3b8475cb6c0b111e968e03.tar.bz2
scummvm-rg350-5964cc239b920a4a5d3b8475cb6c0b111e968e03.zip
SCI: Always re-sort playlist in soundPlay
Previously, it would only sort if a song wasn't already in the playlist. Since initSound already adds it, this effectively prevented the list from being sorted.
Diffstat (limited to 'engines/sci/sound')
-rw-r--r--engines/sci/sound/music.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index 4606d66ace..5b205c82d7 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -410,9 +410,10 @@ void SciMusic::soundPlay(MusicEntry *pSnd) {
}
if (playListNo == playListCount) { // not found
_playList.push_back(pSnd);
- sortPlayList();
}
+ sortPlayList();
+
_mutex.unlock(); // unlock to perform mixer-related calls
if (pSnd->pMidiParser) {