[Scummvm-git-logs] scummvm master -> 21d25d6bfdcd45d3497603cfa656c4ecc912bc25

[dreammaster]

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:
21d25d6bfd XEEN: Wait for farewell finish before leaving tavern/blacksmith


Commit: 21d25d6bfdcd45d3497603cfa656c4ecc912bc25
    https://github.com/scummvm/scummvm/commit/21d25d6bfdcd45d3497603cfa656c4ecc912bc25
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-01-16T18:53:47-08:00

Commit Message:
XEEN: Wait for farewell finish before leaving tavern/blacksmith

Changed paths:
    engines/xeen/locations.cpp


diff --git a/engines/xeen/locations.cpp b/engines/xeen/locations.cpp
index e96c26bc875..4201483c657 100644
--- a/engines/xeen/locations.cpp
+++ b/engines/xeen/locations.cpp
@@ -490,6 +490,9 @@ void BlacksmithLocation::farewell() {
 	if (_ccNum) {
 		sound.stopSound();
 		sound.playVoice("come1.voc", 1);
+
+		while (sound.isSoundPlaying() && !g_vm->shouldExit())
+			g_vm->_events->pollEventsAndWait();
 	}
 }
 
@@ -812,6 +815,8 @@ void TavernLocation::farewell() {
 
 	sound.stopSound();
 	sound.playVoice(_ccNum ? "gdluck1.voc" : "goodbye.voc");
+	while (sound.isSoundPlaying() && !g_vm->shouldExit())
+		g_vm->_events->pollEventsAndWait();
 
 	map.mazeData()._mazeNumber = party._mazeId;
 }