[Scummvm-git-logs] scummvm master -> 886e6d83e6c88f67b9091bd9e00f763eda696f05

[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:
886e6d83e6 SCUMM: COMI: Disable saving/loading during SMUSH videos (#3241)


Commit: 886e6d83e6c88f67b9091bd9e00f763eda696f05
    https://github.com/scummvm/scummvm/commit/886e6d83e6c88f67b9091bd9e00f763eda696f05
Author: Andrea Boscarino (andywinxp at gmail.com)
Date: 2021-08-06T14:58:04+03:00

Commit Message:
SCUMM: COMI: Disable saving/loading during SMUSH videos (#3241)

Changed paths:
    engines/scumm/saveload.cpp


diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 4cc80bf6d6..15857ffc44 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -130,8 +130,9 @@ bool ScummEngine::canSaveGameStateCurrently() {
 	// the main menu) via its scripts, thus we need to make an
 	// exception here. This the same forced overwriting of the
 	// script decisions as in ScummEngine::processKeyboard.
+	// Also, disable saving when a SAN video is playing.
 	if (_game.id == GID_CMI)
-		return true;
+		return !((ScummEngine_v7 *)this)->isSmushActive();
 
 	// SCUMM v4+ doesn't allow saving in room 0 or if
 	// VAR(VAR_MAINMENU_KEY) to set to zero.