[Scummvm-git-logs] scummvm master -> 0b747dba487d8685afcab6432fe646a02bf8d60f

[bluegr]

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:
0b747dba48 SCI: fix #9907 by choosing queued sound with highest priority


Commit: 0b747dba487d8685afcab6432fe646a02bf8d60f
    https://github.com/scummvm/scummvm/commit/0b747dba487d8685afcab6432fe646a02bf8d60f
Author: Zvika Haramaty (haramaty.zvika at gmail.com)
Date: 2020-03-17T09:34:45+02:00

Commit Message:
SCI: fix #9907 by choosing queued sound with highest priority

Changed paths:
    engines/sci/sound/soundcmd.cpp


diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index 5279de8a28..2305b4ff93 100644
--- a/engines/sci/sound/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -838,7 +838,8 @@ void SoundCommandParser::updateSci0Cues() {
 		// Is the sound stopped, and the sound object updated too? If yes, skip
 		// this sound, as SCI0 only allows one active song.
 		if  ((*i)->isQueued) {
-			pWaitingForPlay = (*i);
+			if (!pWaitingForPlay || pWaitingForPlay->priority < (*i)->priority)		// fix #9907
+				pWaitingForPlay = (*i);
 			// FIXME(?): In iceman 2 songs are queued when playing the door
 			// sound - if we use the first song for resuming then it's the wrong
 			// one. Both songs have same priority. Maybe the new sound function