[Scummvm-cvs-logs] scummvm master -> fbb1137f946e929b675e181d1cccfabf46c5b83a

[Strangerke]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
fbb1137f94 MORTEVIELLE: Take shouldQuit() into account while a song is played


Commit: fbb1137f946e929b675e181d1cccfabf46c5b83a
    https://github.com/scummvm/scummvm/commit/fbb1137f946e929b675e181d1cccfabf46c5b83a
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-08-04T01:49:06-07:00

Commit Message:
MORTEVIELLE: Take shouldQuit() into account while a song is played

Changed paths:
    engines/mortevielle/sound.cpp



diff --git a/engines/mortevielle/sound.cpp b/engines/mortevielle/sound.cpp
index 3cb5284..95da5c0 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())
 		;
 }