[Scummvm-git-logs] scummvm master -> 52b7b3194cf496fa8a71c9c4208ec78b92e8aec8

[sev-]

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:
52b7b3194c COMMON: Return application-level value for ConfMan if exists. Bug #15262


Commit: 52b7b3194cf496fa8a71c9c4208ec78b92e8aec8
    https://github.com/scummvm/scummvm/commit/52b7b3194cf496fa8a71c9c4208ec78b92e8aec8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-11-10T02:16:45+01:00

Commit Message:
COMMON: Return application-level value for ConfMan if exists. Bug #15262

This has been since forever. As it is mentioned in the config-manager.cpp,
we need to get rid of these methods. So far, they are used in GUI as supposed
and by usage, the devs were always relying on this behavior.

Thus, changing it should be safe as it seems, however, I plan to remove
these methods completely, so it stays clean without side effects.

Changed paths:
    common/config-manager.cpp


diff --git a/common/config-manager.cpp b/common/config-manager.cpp
index a7a76de8ccb..1bd4c0cdda1 100644
--- a/common/config-manager.cpp
+++ b/common/config-manager.cpp
@@ -533,6 +533,9 @@ const String &ConfigManager::get(const String &key, const String &domName) const
 	if (domain->contains(key))
 		return (*domain)[key];
 
+	if (_appDomain.contains(key))
+		return _appDomain[key];
+
 	return _defaultsDomain.getValOrDefault(key);
 }