[Scummvm-git-logs] scummvm master -> 011d0a1ffe8a68064c3091995caf57fee4ef3b0b

[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:
011d0a1ffe GRIM: Do not list saves for demos - bug #11858


Commit: 011d0a1ffe8a68064c3091995caf57fee4ef3b0b
    https://github.com/scummvm/scummvm/commit/011d0a1ffe8a68064c3091995caf57fee4ef3b0b
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-11-11T13:39:15+02:00

Commit Message:
GRIM: Do not list saves for demos - bug #11858

Changed paths:
    engines/grim/metaengine.cpp


diff --git a/engines/grim/metaengine.cpp b/engines/grim/metaengine.cpp
index 92fcd5d4157..9e8d75c18e4 100644
--- a/engines/grim/metaengine.cpp
+++ b/engines/grim/metaengine.cpp
@@ -118,19 +118,24 @@ Common::KeymapArray GrimMetaEngine::initKeymaps(const char *target) const {
 
 SaveStateList GrimMetaEngine::listSaves(const char *target) const {
 	Common::String gameId = ConfMan.get("gameid", target);
+	Common::String extra = ConfMan.get("extra", target);
+	const bool isDemo = extra.contains("Demo");
 	Common::Platform platform = Common::parsePlatform(ConfMan.get("platform", target));
 	Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
 	Common::StringArray filenames;
 	Common::String pattern = gameId == "monkey4" ? "efmi###.gsv" : "grim##.gsv";
+	SaveStateList saveList;
+	char str[256];
+	int32 strSize;
 
 	if (platform == Common::kPlatformPS2)
 		pattern = "efmi###.ps2";
 
+	if (isDemo)
+		return saveList; // Demos do not support saving
+
 	filenames = saveFileMan->listSavefiles(pattern);
 
-	SaveStateList saveList;
-	char str[256];
-	int32 strSize;
 	for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); ++file) {
 		// Obtain the last digits of the filename, since they correspond to the save slot
 		int slotNum = atoi(file->c_str() + 4);