From e552bc57baf616daae8fb8831b6bf10c933db106 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 24 Sep 2011 18:44:57 +0300
Subject: SCI: Always reset hold when starting a new song. Fixes bug #3413589 -
 "SCI: KQ6CD: Game stops responding in the catacombs"

kDoSoundSetHold is always called after kDoSoundPlay. A regression from
commit 4f3b85f4efc05affb7b4a7080e349360a3352048
---
 engines/sci/sound/soundcmd.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'engines/sci')

diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index e73df69375..b723117811 100644
--- a/engines/sci/sound/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -163,6 +163,9 @@ void SoundCommandParser::processPlaySound(reg_t obj) {
 
 	musicSlot->loop = readSelectorValue(_segMan, obj, SELECTOR(loop));
 	musicSlot->priority = readSelectorValue(_segMan, obj, SELECTOR(priority));
+	// Reset hold when starting a new song. kDoSoundSetHold is always called after
+	// kDoSoundPlay to set it properly, if needed. Fixes bug #3413589.
+	musicSlot->hold = -1;
 	if (_soundVersion >= SCI_VERSION_1_EARLY)
 		musicSlot->volume = readSelectorValue(_segMan, obj, SELECTOR(vol));
 
-- 
cgit v1.2.3