[Scummvm-git-logs] scummvm master -> 2a00a342bbd369454cb4874c6ae0c1f8d20420a9

[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:
2a00a342bb AGI: set gameid according to *.wag file only if it's a known value


Commit: 2a00a342bbd369454cb4874c6ae0c1f8d20420a9
    https://github.com/scummvm/scummvm/commit/2a00a342bbd369454cb4874c6ae0c1f8d20420a9
Author: Zvika Haramaty (haramaty.zvika at gmail.com)
Date: 2022-04-17T14:13:52+03:00

Commit Message:
AGI: set gameid according to *.wag file only if it's a known value

Changed paths:
    engines/agi/detection.cpp


diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp
index 50f936900ea..1c212612c11 100644
--- a/engines/agi/detection.cpp
+++ b/engines/agi/detection.cpp
@@ -275,8 +275,8 @@ ADDetectedGame AgiMetaEngineDetection::fallbackDetect(const FileMap &allFilesXXX
 			g_fallbackDesc.version = wagFileParser.convertToAgiVersionNumber(*wagAgiVer);
 		}
 
-		// Set gameid according to *.wag file information if it's present and it doesn't contain whitespace.
-		if (wagGameID != nullptr && !Common::String(wagGameID->getData()).contains(" ")) {
+		// Set gameid according to *.wag file information if it's present and it's a known value
+		if (wagGameID != nullptr && findPlainGameDescriptor(wagGameID->getData(), agiGames)) {
 			_gameid = wagGameID->getData();
 			debug(3, "Agi::fallbackDetector: Using game id (%s) from WAG file", _gameid.c_str());
 		}