From 56431cfc596a8af6d821239253acc07b16f783bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torbj=C3=B6rn=20Andersson?= Date: Sat, 10 Aug 2013 16:56:07 +0200 Subject: [PATCH] TINSEL: Fix DW2 assertion when quitting during cutscene 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.) --- engines/tinsel/tinsel.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp index 9075e1adb122..5d410e62c7c2 100644 --- a/engines/tinsel/tinsel.cpp +++ b/engines/tinsel/tinsel.cpp @@ -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();