aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorStrangerke2013-08-04 10:49:06 +0200
committerStrangerke2013-08-04 10:49:06 +0200
commitfbb1137f946e929b675e181d1cccfabf46c5b83a (patch)
tree81e746397fa9ff4422ffb250066876e83fe7bda6 /engines
parentc1f93815ee9d41d4e505dde87fdd503f94e31dae (diff)
downloadscummvm-rg350-fbb1137f946e929b675e181d1cccfabf46c5b83a.tar.gz
scummvm-rg350-fbb1137f946e929b675e181d1cccfabf46c5b83a.tar.bz2
scummvm-rg350-fbb1137f946e929b675e181d1cccfabf46c5b83a.zip
MORTEVIELLE: Take shouldQuit() into account while a song is played
Diffstat (limited to 'engines')
-rw-r--r--engines/mortevielle/sound.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/mortevielle/sound.cpp b/engines/mortevielle/sound.cpp
index 3cb5284494..95da5c0e01 100644
--- a/engines/mortevielle/sound.cpp
+++ b/engines/mortevielle/sound.cpp
@@ -189,7 +189,7 @@ void SoundManager::playSong(const byte* buf, int size) {
Audio::AudioStream *stream = Audio::makeRawStream(buf, size, 11025 / 2, Audio::FLAG_UNSIGNED | Audio::FLAG_LITTLE_ENDIAN | Audio::FLAG_16BITS);
_mixer->playStream(Audio::Mixer::kSFXSoundType, &_speakerHandle, stream, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO);
- while (_mixer->isSoundHandleActive(_speakerHandle) && !_vm->keyPressed() && !_vm->_mouseClick)
+ while (_mixer->isSoundHandleActive(_speakerHandle) && !_vm->keyPressed() && !_vm->_mouseClick && !_vm->shouldQuit())
;
}