aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/smush
diff options
context:
space:
mode:
authorPaweł Kołodziejski2006-03-05 12:29:13 +0000
committerPaweł Kołodziejski2006-03-05 12:29:13 +0000
commit7a6ff46b38ae276c8052bd0ed716c6fd38e4b335 (patch)
tree287400fa8f0ca1b5081d0b06c5d2b063464926d5 /engines/scumm/smush
parent38b82fb585ba23db45dee094e7dc9a0b19939910 (diff)
downloadscummvm-rg350-7a6ff46b38ae276c8052bd0ed716c6fd38e4b335.tar.gz
scummvm-rg350-7a6ff46b38ae276c8052bd0ed716c6fd38e4b335.tar.bz2
scummvm-rg350-7a6ff46b38ae276c8052bd0ed716c6fd38e4b335.zip
that was not what I want. it should stop audio only for immediately stop.
svn-id: r21095
Diffstat (limited to 'engines/scumm/smush')
-rw-r--r--engines/scumm/smush/smush_player.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp
index ebbea35dfa..d4e7b546db 100644
--- a/engines/scumm/smush/smush_player.cpp
+++ b/engines/scumm/smush/smush_player.cpp
@@ -1367,10 +1367,12 @@ void SmushPlayer::play(const char *filename, int32 offset, int32 startFrame) {
debugC(DEBUG_SMUSH, "Smush stats: BackendUpdateScreen( %03d )", end_time - start_time);
}
- if (_vm->_smushVideoShouldFinish || _vm->_quit || _vm->_saveLoadFlag) {
+ if (_vm->_quit || _vm->_saveLoadFlag) {
_smixer->stop();
break;
}
+ if (_vm->_smushVideoShouldFinish || _vm->_quit || _vm->_saveLoadFlag)
+ break;
_vm->_system->delayMillis(10);
}