[Scummvm-cvs-logs] scummvm master -> 56431cfc596a8af6d821239253acc07b16f783bf

[eriktorbjorn]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
56431cfc59 TINSEL: Fix DW2 assertion when quitting during cutscene


Commit: 56431cfc596a8af6d821239253acc07b16f783bf
    https://github.com/scummvm/scummvm/commit/56431cfc596a8af6d821239253acc07b16f783bf
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2013-08-10T07:56:07-07:00

Commit Message:
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.)

Changed paths:
    engines/tinsel/tinsel.cpp



diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp
index 9075e1a..5d410e6 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();