[Scummvm-git-logs] scummvm master -> 98e7c9444bd938349147ed27ec8ef5a73d1dcd8f

[eriktorbjorn]

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:
98e7c9444b SHERLOCK: Only create autosave on startup if that slot is empty


Commit: 98e7c9444bd938349147ed27ec8ef5a73d1dcd8f
    https://github.com/scummvm/scummvm/commit/98e7c9444bd938349147ed27ec8ef5a73d1dcd8f
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2021-12-27T09:24:07+01:00

Commit Message:
SHERLOCK: Only create autosave on startup if that slot is empty

Otherwise, you'll lose your old autosave every time you start the game,
unless you load the savegame from the ScummVM launcher.

Changed paths:
    engines/sherlock/sherlock.cpp


diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 07ea8f9378e..f9bbee4d8f5 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -137,8 +137,12 @@ Common::Error SherlockEngine::run() {
 			showOpening();
 		} while (!shouldQuit() && !_interactiveFl);
 
-		// Signal startup autosave
-		_startupAutosave = true;
+		// Signal startup autosave, if there isn't already a save in
+		// that slot.
+		SaveStateDescriptor desc = getMetaEngine()->querySaveMetaInfos(
+			_targetName.c_str(), getAutosaveSlot());
+		if (!desc.isValid())
+			_startupAutosave = true;
 	}
 
 	while (!shouldQuit()) {