thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: fix thread lockup issue when loading savegames using a sound driver which depends on the mixer thread for timer calls.

Browse source 
The issues seems to be known. See comments (not by me) in SciMusic::clearPlayList().
For the same reason mentioned there the mutex may also not be locked before calling clearPlayList().
This commit is contained in:
athrxx 2011-10-21 22:24:59 +02:00
parent af32b71e4c
commit 46bcd3b5e9
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
engines/sci/engine/savegame.cpp
View file

@ -545,8 +545,6 @@ void DataStack::saveLoadWithSerializer(Common::Serializer &s) {
void SciMusic::saveLoadWithSerializer(Common::Serializer &s) { void SciMusic::saveLoadWithSerializer(Common::Serializer &s) {
// Sync song lib data. When loading, the actual song lib will be initialized // Sync song lib data. When loading, the actual song lib will be initialized
// afterwards in gamestate_restore() // afterwards in gamestate_restore()
Common::StackLock lock(_mutex);
int songcount = 0; int songcount = 0;
byte masterVolume = soundGetMasterVolume(); byte masterVolume = soundGetMasterVolume();
byte reverb = _pMidiDrv->getReverb(); byte reverb = _pMidiDrv->getReverb();
@ -576,9 +574,12 @@ void SciMusic::saveLoadWithSerializer(Common::Serializer &s) {
songcount = _playList.size(); songcount = _playList.size();
s.syncAsUint32LE(songcount); s.syncAsUint32LE(songcount);
if (s.isLoading()) { if (s.isLoading())
clearPlayList(); clearPlayList();
Common::StackLock lock(_mutex);
if (s.isLoading()) {
for (int i = 0; i < songcount; i++) { for (int i = 0; i < songcount; i++) {
MusicEntry *curSong = new MusicEntry(); MusicEntry *curSong = new MusicEntry();
curSong->saveLoadWithSerializer(s); curSong->saveLoadWithSerializer(s);