[Scummvm-git-logs] scummvm master -> b29b5acc0a2b0ebf7dd9a91ffeafbc65acda241d

[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:
b29b5acc0a COMMON: (MASS ADD) - fix language code comparison for obsolete lang codes


Commit: b29b5acc0a2b0ebf7dd9a91ffeafbc65acda241d
    https://github.com/scummvm/scummvm/commit/b29b5acc0a2b0ebf7dd9a91ffeafbc65acda241d
Author: athrxx (athrxx at scummvm.org)
Date: 2022-05-15T18:50:13+02:00

Commit Message:
COMMON: (MASS ADD) - fix language code comparison for obsolete lang codes

We now correctly recognize obsolete language codes.
(e. g. "jp" will be considered the same as "ja")

Another step to bring down the number of detected targets...

Changed paths:
    gui/massadd.cpp


diff --git a/gui/massadd.cpp b/gui/massadd.cpp
index 51b1e5f5e20..018c96bee7e 100644
--- a/gui/massadd.cpp
+++ b/gui/massadd.cpp
@@ -208,11 +208,11 @@ void MassAddDialog::handleTickle() {
 					// If the engineid, gameid, platform and language match -> skip it
 					Common::ConfigManager::Domain *dom = ConfMan.getDomain(*iter);
 					assert(dom);
-
+					
 					if ((*dom)["engineid"] == result.engineId &&
 						(*dom)["gameid"] == result.gameId &&
 					    dom->getValOrDefault("platform") == resultPlatformCode &&
-					    dom->getValOrDefault("language") == resultLanguageCode) {
+						parseLanguage(dom->getValOrDefault("language")) == parseLanguage(resultLanguageCode)) {
 						duplicate = true;
 						break;
 					}