[Scummvm-git-logs] scummvm master -> 6cf52b515dc950f69c000929bc588d5653169f20

[sev-]

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:
6cf52b515d QUEEN: Prevent hang when closing core during dialog


Commit: 6cf52b515dc950f69c000929bc588d5653169f20
    https://github.com/scummvm/scummvm/commit/6cf52b515dc950f69c000929bc588d5653169f20
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2019-09-22T23:18:14+02:00

Commit Message:
QUEEN: Prevent hang when closing core during dialog

Co-authored-by: jdgleaver <jdgleaver at users.noreply.github.com>

Changed paths:
    engines/queen/sound.cpp


diff --git a/engines/queen/sound.cpp b/engines/queen/sound.cpp
index d715d37..85c1f82 100644
--- a/engines/queen/sound.cpp
+++ b/engines/queen/sound.cpp
@@ -289,7 +289,9 @@ void PCSound::playSound(const char *base, bool isSpeech) {
 	}
 	strcat(name, ".SB");
 	if (isSpeech) {
-		while (_mixer->isSoundHandleActive(_speechHandle)) {
+		// Add _vm->shouldQuit() check here, otherwise game gets stuck
+		// in an infinite loop if we try to quit while a sound is playing...
+		while (_mixer->isSoundHandleActive(_speechHandle) && !_vm->shouldQuit()) {
 			_vm->input()->delay(10);
 		}
 	} else {