diff options
| author | Torbjörn Andersson | 2013-08-10 16:56:07 +0200 |
|---|---|---|
| committer | Torbjörn Andersson | 2013-08-10 16:56:07 +0200 |
| commit | 56431cfc596a8af6d821239253acc07b16f783bf (patch) | |
| tree | 5167e8069522ac2c084df2c2dd83487f7149efbd | |
| parent | 7d6d7a7945dc75f94fce5e68ed0b0d784edb43c1 (diff) | |
| download | scummvm-rg350-56431cfc596a8af6d821239253acc07b16f783bf.tar.gz scummvm-rg350-56431cfc596a8af6d821239253acc07b16f783bf.tar.bz2 scummvm-rg350-56431cfc596a8af6d821239253acc07b16f783bf.zip | |
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.)
| -rw-r--r-- | engines/tinsel/tinsel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp index 9075e1adb1..5d410e62c7 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(); |