aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2013-08-10 17:32:00 +0200
committerStrangerke2013-08-10 17:32:00 +0200
commit9569aff5e69746ccb233ada4257fc9d28f444b73 (patch)
tree817cfc362d754379ab521ac32f45805bf4b890e2
parent272740bb5c4ef1576ccf270f944c4f7dfef66d5c (diff)
parent56431cfc596a8af6d821239253acc07b16f783bf (diff)
downloadscummvm-rg350-9569aff5e69746ccb233ada4257fc9d28f444b73.tar.gz
scummvm-rg350-9569aff5e69746ccb233ada4257fc9d28f444b73.tar.bz2
scummvm-rg350-9569aff5e69746ccb233ada4257fc9d28f444b73.zip
Merge branch 'master' of github.com:scummvm/scummvm
-rw-r--r--engines/tinsel/tinsel.cpp6
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();