libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-02 08:19:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI: fixing possible deadlock inside clearPlaylist

Browse Source 
thx to ajax16384

svn-id: r53613
This commit is contained in:
Martin Kiewitz 2010-10-19 14:53:39 +00:00
parent 6a1e874447
commit f8c7243938
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/sci/sound/music.cpp
View File

@ -158,8 +158,10 @@ void SciMusic::sendMidiCommandsFromQueue() {
}
void SciMusic::clearPlayList() {
Common::StackLock lock(_mutex);
// we must NOT lock our mutex here. Playlist is modified inside soundKill() which will lock the mutex
// during deletion. If we lock it here, a deadlock may occur within soundStop() because that one
// calls the mixer, which will also lock the mixer mutex and if the mixer thread is active during
// that time, we will get a deadlock.
while (!_playList.empty()) {
soundStop(_playList[0]);
soundKill(_playList[0]);