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

[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:
c6882da457 SCI: call resetGlobalPauseCounter() when loading from original save/load dialog


Commit: c6882da457906383ca79c608d3d3d80ead6a9dda
    https://github.com/scummvm/scummvm/commit/c6882da457906383ca79c608d3d3d80ead6a9dda
Author: athrxx (athrxx at scummvm.org)
Date: 2024-08-29T09:49:07+03:00

Commit Message:
SCI: call resetGlobalPauseCounter() when loading from original save/load dialog

This was done only for the ScummVM save/load dialogs, but there are situations
where the global pause counter runs out of sync regardless of whether these
dialogs or the original ones get used (e. g. bug no. 15336). The counter should
always be 0 after loading a savegame.

Changed paths:
    engines/sci/engine/kfile.cpp


diff --git a/engines/sci/engine/kfile.cpp b/engines/sci/engine/kfile.cpp
index 7e8db3a0be7..766890668f4 100644
--- a/engines/sci/engine/kfile.cpp
+++ b/engines/sci/engine/kfile.cpp
@@ -1286,6 +1286,8 @@ reg_t kRestoreGame(EngineState *s, int argc, reg_t *argv) {
 			g_sci->_soundCmd->pauseAll(false); // unpause music
 		else
 			g_sci->_soundCmd->resetGlobalPauseCounter(); // reset music global pause counter without affecting the individual sounds
+	} else if (s->r_acc.isNull() && g_sci->_soundCmd->isGlobalPauseActive()) {
+		g_sci->_soundCmd->resetGlobalPauseCounter(); // reset music global pause counter without affecting the individual sounds
 	}
 
 	return s->r_acc;