[Scummvm-git-logs] scummvm branch-2-3 -> 07878592a4cb728bd4acad6404571a7b13451a21

[athrxx]

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:
07878592a4 SCUMM: (FT) - fix bug no. 12903 ("Sometimes skipping videos occur")


Commit: 07878592a4cb728bd4acad6404571a7b13451a21
    https://github.com/scummvm/scummvm/commit/07878592a4cb728bd4acad6404571a7b13451a21
Author: athrxx (athrxx at scummvm.org)
Date: 2021-09-09T16:10:16+02:00

Commit Message:
SCUMM: (FT) - fix bug no. 12903 ("Sometimes skipping videos occur")

Prevent autosave during smush playback. Thanks to AndywinXp for the tip.

Changed paths:
    engines/scumm/saveload.cpp


diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 46833d6578..8ea688393d 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -132,8 +132,10 @@ bool ScummEngine::canSaveGameStateCurrently() {
 	// 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.version >= 7 && ((ScummEngine_v7 *)this)->isSmushActive())
+		return false;
 	if (_game.id == GID_CMI)
-		return !((ScummEngine_v7 *)this)->isSmushActive();
+		return true;
 #endif
 
 	// SCUMM v4+ doesn't allow saving in room 0 or if