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

TINSEL: Fix DW2 assertion when quitting during cutscene

Browse Source 
Call _bmv->FinishBMV() before setting g_pCurBgnd to NULL. Otherwise,
there will be an assertion if quitting during a cutscene while a
subtitle is being shown. (At least I think that's the condition.)

(Also, it seems to be a good idea to call it before EndScene(),
because even though there was no assertion, I got a lot of warnings
when I did it after.)
This commit is contained in:
Torbjörn Andersson 2013-08-10 16:56:07 +02:00
parent 7d6d7a7945
commit 56431cfc59
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/tinsel/tinsel.cpp
View File

@ -868,9 +868,6 @@ TinselEngine::TinselEngine(OSystem *syst, const TinselGameDescription *gameDesc)
}
TinselEngine::~TinselEngine() {
if (_bmv->MoviePlaying())
_bmv->FinishBMV();
_system->getAudioCDManager()->stop();
delete _bmv;
delete _sound;
@ -1007,6 +1004,9 @@ Common::Error TinselEngine::run() {
g_system->delayMillis(10);
}
if (_bmv->MoviePlaying())
_bmv->FinishBMV();
// Write configuration
_vm->_config->writeToDisk();