diff options
| author | Max Horn | 2003-06-14 20:55:09 +0000 |
|---|---|---|
| committer | Max Horn | 2003-06-14 20:55:09 +0000 |
| commit | 08e772dcf06b4f31645461bb0bda44d5a0a58927 (patch) | |
| tree | 0e3670128ae60d67a576ce68b689bf419a87933f | |
| parent | f7a8cbf7c73479ff086276ef04b0fea15085a13a (diff) | |
| download | scummvm-rg350-08e772dcf06b4f31645461bb0bda44d5a0a58927.tar.gz scummvm-rg350-08e772dcf06b4f31645461bb0bda44d5a0a58927.tar.bz2 scummvm-rg350-08e772dcf06b4f31645461bb0bda44d5a0a58927.zip | |
Fix for bug #751782 (Quitting during SMUSH movies doesn't always work)
svn-id: r8483
| -rw-r--r-- | scumm/scummvm.cpp | 1 | ||||
| -rw-r--r-- | scumm/smush/smush_player.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index cdc30728cd..ca3e6c0ca4 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -2351,7 +2351,6 @@ void Scumm::parseEvents() { case OSystem::EVENT_QUIT: _quit = true; - _videoFinished = true; break; default: diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp index 944a223527..605e15c25f 100644 --- a/scumm/smush/smush_player.cpp +++ b/scumm/smush/smush_player.cpp @@ -897,7 +897,7 @@ void SmushPlayer::play(const char *filename, const char *directory) { debug(4, "Smush stats: BackendUpdateScreen( %03d )", end_time - start_time); } - if (_scumm->_videoFinished) + if (_scumm->_videoFinished || _scumm->_quit) break; if (_scumm->_saveLoadFlag) break; |