[Scummvm-git-logs] scummvm master -> 3bcaa5440d66b4bb7e39250c6005c1d7717dedc6

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
3bcaa5440d AGOS: Fix issue with detection order for Simon 2. Fixes bug #16803


Commit: 3bcaa5440d66b4bb7e39250c6005c1d7717dedc6
    https://github.com/scummvm/scummvm/commit/3bcaa5440d66b4bb7e39250c6005c1d7717dedc6
Author: Robert Megone (robert.megone at gmail.com)
Date: 2026-05-14T16:25:28+03:00

Commit Message:
AGOS: Fix issue with detection order for Simon 2. Fixes bug #16803

Changed paths:
    engines/agos/detection.cpp


diff --git a/engines/agos/detection.cpp b/engines/agos/detection.cpp
index 5d077827dc6..c141f2fdd68 100644
--- a/engines/agos/detection.cpp
+++ b/engines/agos/detection.cpp
@@ -159,13 +159,15 @@ public:
 		const bool hadLanguage = ConfMan.hasKey("language");
 		const Common::String originalLanguage = hadLanguage ? ConfMan.get("language") : Common::String();
 
-		if (isSimon2Target && hadLanguage)
+		Common::Error err = AdvancedMetaEngineDetection::identifyGame(game, descriptor);
+
+		if (err.getCode() != Common::kNoError && isSimon2Target && hadLanguage) {
 			ConfMan.set("language", Common::getLanguageCode(Common::EN_ANY));
 
-		Common::Error err = AdvancedMetaEngineDetection::identifyGame(game, descriptor);
+			err = AdvancedMetaEngineDetection::identifyGame(game, descriptor);
 
-		if (isSimon2Target && hadLanguage)
 			ConfMan.set("language", originalLanguage);
+		}
 
 		if (err.getCode() == Common::kNoError && game.gameId == "simon2" && ConfMan.hasKey("path")) {
 			Common::FSNode gameDir(ConfMan.getPath("path"));