mirror of
https://github.com/libretro/scummvm.git
synced 2024-12-24 10:45:46 +00:00
SCI: dont seek during init of music but on play, fixes assert when restoring saves caused by r49905 - because channel remapping isn't done at that point
svn-id: r49907
This commit is contained in:
parent
02c3397ddf
commit
289b668099
@ -224,8 +224,6 @@ void SciMusic::soundInitSnd(MusicEntry *pSnd) {
|
||||
channelFilterMask = pSnd->soundRes->getChannelFilterMask(_pMidiDrv->getPlayId(), _pMidiDrv->hasRhythmChannel());
|
||||
pSnd->pMidiParser->loadMusic(track, pSnd, channelFilterMask, _soundVersion);
|
||||
|
||||
// Fast forward to the last position and perform associated events when loading
|
||||
pSnd->pMidiParser->jumpToTick(pSnd->ticker, true);
|
||||
_mutex.unlock();
|
||||
}
|
||||
}
|
||||
@ -316,6 +314,9 @@ void SciMusic::soundPlay(MusicEntry *pSnd) {
|
||||
pSnd->pMidiParser->setVolume(pSnd->volume);
|
||||
if (pSnd->status == kSoundStopped)
|
||||
pSnd->pMidiParser->jumpToTick(0);
|
||||
else
|
||||
// Fast forward to the last position and perform associated events when loading
|
||||
pSnd->pMidiParser->jumpToTick(pSnd->ticker, true);
|
||||
}
|
||||
_mutex.unlock();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user