diff options
| author | Max Horn | 2005-01-16 13:32:48 +0000 |
|---|---|---|
| committer | Max Horn | 2005-01-16 13:32:48 +0000 |
| commit | d541535ab6cdb38f8d6efba68411477adec136f5 (patch) | |
| tree | 033f4213a78689db32734fd4af63f6f80ebf240b /scumm/smush | |
| parent | fe424ed5ae36b0ac99d0f17ad563b57bed69cec5 (diff) | |
| download | scummvm-rg350-d541535ab6cdb38f8d6efba68411477adec136f5.tar.gz scummvm-rg350-d541535ab6cdb38f8d6efba68411477adec136f5.tar.bz2 scummvm-rg350-d541535ab6cdb38f8d6efba68411477adec136f5.zip | |
Cosmetic change, avoiding a hypothetical threading problem, see bug #1098864
svn-id: r16569
Diffstat (limited to 'scumm/smush')
| -rw-r--r-- | scumm/smush/smush_player.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp index d5eaac4511..0076c287a9 100644 --- a/scumm/smush/smush_player.cpp +++ b/scumm/smush/smush_player.cpp @@ -257,8 +257,7 @@ SmushPlayer::SmushPlayer(ScummEngine_v6 *scumm, int speed) { } SmushPlayer::~SmushPlayer() { - if (_initDone) - release(); + release(); } void SmushPlayer::init() { @@ -286,7 +285,9 @@ void SmushPlayer::init() { } void SmushPlayer::release() { - + if (!_initDone) + return; + _vm->_timer->removeTimerProc(&timerCallback); _vm->_smushVideoShouldFinish = true; @@ -334,6 +335,9 @@ void SmushPlayer::release() { // some explanation. _vm->virtscr[0].pitch = _origPitch; _vm->gdi._numStrips = _origNumStrips; + + + _initDone = false; } void SmushPlayer::checkBlock(const Chunk &b, Chunk::type type_expected, uint32 min_size) { |