[Scummvm-git-logs] scummvm branch-2-7 -> c3fa9b893276290592a0718a4ea9207518b406ad

[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:
c3fa9b8932 SCUMM: GUI: Correctly save the shake screen flag


Commit: c3fa9b893276290592a0718a4ea9207518b406ad
    https://github.com/scummvm/scummvm/commit/c3fa9b893276290592a0718a4ea9207518b406ad
Author: AndywinXp (andywinxp at gmail.com)
Date: 2023-01-23T16:15:14+01:00

Commit Message:
SCUMM: GUI: Correctly save the shake screen flag

Changed paths:
    engines/scumm/gfx_gui.cpp


diff --git a/engines/scumm/gfx_gui.cpp b/engines/scumm/gfx_gui.cpp
index 923c3ebab90..734db7c2c77 100644
--- a/engines/scumm/gfx_gui.cpp
+++ b/engines/scumm/gfx_gui.cpp
@@ -2222,11 +2222,18 @@ bool ScummEngine::executeMainMenuOperation(int op, int mouseX, int mouseY, bool
 				curSlot = _mainMenuSavegameLabel + (isLoomVga ? _firstSaveStateOfList : _curDisplayedSaveSlotPage * 9);
 				if (canWriteGame(curSlot)) {
 					restoreCursorPostMenu();
+
+					// Temporarily restore the shake effect to save it...
+					setShake(_shakeTempSavedState);
+
 					if (saveState(curSlot - 1, false, dummyString)) {
+						setShake(0);
 						saveCursorPreMenu();
 						_saveScriptParam = GAME_PROPER_SAVE;
 						drawMainMenuControls();
 						return true;
+					} else {
+						setShake(0);
 					}
 				} else {
 					convertMessageToString((const byte *)getGUIString(gsGameNotSaved), (byte *)saveScreenTitle, sizeof(saveScreenTitle));