[Scummvm-git-logs] scummvm master -> 36f01470a751e8245b017c7559fe27d3bbbd2b1d

[OMGPizzaGuy]

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:
36f01470a7 ULTIMA8: Allow vistory fanfare music to complete when switching out of combat mode.


Commit: 36f01470a751e8245b017c7559fe27d3bbbd2b1d
    https://github.com/scummvm/scummvm/commit/36f01470a751e8245b017c7559fe27d3bbbd2b1d
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2024-05-11T21:35:28-05:00

Commit Message:
ULTIMA8: Allow vistory fanfare music to complete when switching out of combat mode.
Fixes #14849

Changed paths:
    engines/ultima/ultima8/audio/u8_music_process.cpp


diff --git a/engines/ultima/ultima8/audio/u8_music_process.cpp b/engines/ultima/ultima8/audio/u8_music_process.cpp
index e8379c4157c..089995ee61d 100644
--- a/engines/ultima/ultima8/audio/u8_music_process.cpp
+++ b/engines/ultima/ultima8/audio/u8_music_process.cpp
@@ -90,8 +90,12 @@ void U8MusicProcess::unqueueMusic() {
 }
 
 void U8MusicProcess::restoreMusic() {
-	_trackState._queued = 0;
 	_combatMusicActive = false;
+	if (_trackState._queued) {
+		_trackState._queued = _trackState._lastRequest;
+		return;
+	}
+
 	playMusic_internal(_trackState._lastRequest);
 }