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

[AndywinXp]

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:
e949b1ed47 SCUMM: GUI: Restore previous _saveSound at the end of menu


Commit: e949b1ed4710ab0644878f2261a547b9e1f31401
    https://github.com/scummvm/scummvm/commit/e949b1ed4710ab0644878f2261a547b9e1f31401
Author: AndywinXp (andywinxp at gmail.com)
Date: 2023-09-14T15:17:54+02:00

Commit Message:
SCUMM: GUI: Restore previous _saveSound at the end of menu

Fixes the main part of ticket #14618.
Fix suggested by eriktorbjorn.

Changed paths:
    engines/scumm/gfx_gui.cpp


diff --git a/engines/scumm/gfx_gui.cpp b/engines/scumm/gfx_gui.cpp
index 1bbf967fac7..c8fcf285cd2 100644
--- a/engines/scumm/gfx_gui.cpp
+++ b/engines/scumm/gfx_gui.cpp
@@ -1787,6 +1787,8 @@ void ScummEngine::showMainMenu() {
 	if (VAR_PRE_SAVELOAD_SCRIPT != 0xFF)
 		runScript(VAR(VAR_PRE_SAVELOAD_SCRIPT), 0, 0, nullptr);
 
+	int oldSaveSound = _saveSound;
+
 	_saveSound = 1;
 	_shakeTempSavedState = _shakeEnabled;
 	setShake(0);
@@ -1961,6 +1963,8 @@ void ScummEngine::showMainMenu() {
 		}
 	}
 
+	_saveSound = oldSaveSound;
+
 	_mainMenuIsActive = false;
 
 	if (_game.version > 6)