Skip to content

Commit

Permalink
Merge branch 'master' of github.com:scummvm/scummvm
Browse files Browse the repository at this point in the history
  • Loading branch information
Strangerke committed Aug 10, 2013
2 parents 272740b + 56431cf commit 9569aff
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions engines/tinsel/tinsel.cpp
Expand Up @@ -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;
Expand Down Expand Up @@ -1007,6 +1004,9 @@ Common::Error TinselEngine::run() {
g_system->delayMillis(10);
}

if (_bmv->MoviePlaying())
_bmv->FinishBMV();

// Write configuration
_vm->_config->writeToDisk();

Expand Down

0 comments on commit 9569aff

Please sign in to comment.