[Scummvm-git-logs] scummvm master -> 8386e92d40dfcd61a12966d4502715f81580f9d4

[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:
8386e92d40 SCI: Fix incorrect music state after saving via the GMM (bug #13447)


Commit: 8386e92d40dfcd61a12966d4502715f81580f9d4
    https://github.com/scummvm/scummvm/commit/8386e92d40dfcd61a12966d4502715f81580f9d4
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2022-04-28T00:58:56+03:00

Commit Message:
SCI: Fix incorrect music state after saving via the GMM (bug #13447)

This was initially introduced in d8336a31f, but didn't work properly
with SCI0 music. Many thanks to athrxx for tracking the issue and
suggesting a fix

Changed paths:
    engines/sci/metaengine.cpp


diff --git a/engines/sci/metaengine.cpp b/engines/sci/metaengine.cpp
index 9e5e80beeda..bc5c84a6408 100644
--- a/engines/sci/metaengine.cpp
+++ b/engines/sci/metaengine.cpp
@@ -441,7 +441,9 @@ Common::Error SciEngine::loadGameState(int slot) {
 Common::Error SciEngine::saveGameState(int slot, const Common::String &desc, bool isAutosave) {
 	const char *version = "";
 	g_sci->_soundCmd->pauseAll(false); // unpause music (we can't have it paused during save)
-	return gamestate_save(_gamestate, slot, desc, version) ? Common::kNoError : Common::kWritingFailed;
+	const bool res = gamestate_save(_gamestate, slot, desc, version);
+	g_sci->_soundCmd->pauseAll(true); // pause music
+	return res ? Common::kNoError : Common::kWritingFailed;
 }
 
 bool SciEngine::canLoadGameStateCurrently() {