[Scummvm-git-logs] scummvm master -> b8bc864abd33624d8be967df9dac79a2f3c4f83d

[athrxx]

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:
b8bc864abd SCUMM: (LOOM/FM-Towns) - fix regression


Commit: b8bc864abd33624d8be967df9dac79a2f3c4f83d
    https://github.com/scummvm/scummvm/commit/b8bc864abd33624d8be967df9dac79a2f3c4f83d
Author: athrxx (athrxx at scummvm.org)
Date: 2022-08-14T01:40:49+02:00

Commit Message:
SCUMM: (LOOM/FM-Towns) - fix regression

Target is partly dysfunctional. Savegames can still be loaded from GMM, but the game will abort at the difficulty select dialog when starting normally...

Changed paths:
    engines/scumm/sound.cpp


diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp
index 145ed6c22fb..b643d55cf4b 100644
--- a/engines/scumm/sound.cpp
+++ b/engines/scumm/sound.cpp
@@ -1203,7 +1203,7 @@ void Sound::pauseSounds(bool pause) {
 
 	_mixer->pauseAll(pause);
 
-	if ((_vm->_game.features & GF_AUDIOTRACKS) && _vm->VAR(_vm->VAR_MUSIC_TIMER) > 0) {
+	if ((_vm->_game.features & GF_AUDIOTRACKS) && _vm->VAR_MUSIC_TIMER != 0xFF && _vm->VAR(_vm->VAR_MUSIC_TIMER) > 0) {
 		if (pause)
 			stopCDTimer();
 		else