aboutsummaryrefslogtreecommitdiff
path: root/gui/launcher.cpp
diff options
context:
space:
mode:
authorMax Horn2008-06-11 06:22:02 +0000
committerMax Horn2008-06-11 06:22:02 +0000
commit42427f9a4ec2ec768d355729bbdd77f52ddb37b9 (patch)
treecd7df321e6704ec4f9ee7de6319d38197e8c9449 /gui/launcher.cpp
parentfefad792495e0fbd45d120a83b19090e3b7a0cf3 (diff)
downloadscummvm-rg350-42427f9a4ec2ec768d355729bbdd77f52ddb37b9.tar.gz
scummvm-rg350-42427f9a4ec2ec768d355729bbdd77f52ddb37b9.tar.bz2
scummvm-rg350-42427f9a4ec2ec768d355729bbdd77f52ddb37b9.zip
Modified mass detector to not re-add already configured games (that is, if there is an existing entry with identical path, gameid, platform, language, then do not add a new one)
svn-id: r32664
Diffstat (limited to 'gui/launcher.cpp')
-rw-r--r--gui/launcher.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index 92867562ad..2c1212b84a 100644
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@ -572,8 +572,16 @@ void LauncherDialog::updateListing() {
// Retrieve a list of all games defined in the config file
_domains.clear();
const ConfigManager::DomainMap &domains = ConfMan.getGameDomains();
- ConfigManager::DomainMap::const_iterator iter = domains.begin();
+ ConfigManager::DomainMap::const_iterator iter;
for (iter = domains.begin(); iter != domains.end(); ++iter) {
+#ifdef __DS__
+ // DS port uses an extra section called 'ds'. This prevents the section from being
+ // detected as a game.
+ if (iter->_key == "ds") {
+ continue;
+ }
+#endif
+
String gameid(iter->_value.get("gameid"));
String description(iter->_value.get("description"));
@@ -585,14 +593,6 @@ void LauncherDialog::updateListing() {
description = g.description();
}
-#ifdef __DS__
- // DS port uses an extra section called 'ds'. This prevents the section from being
- // detected as a game.
- if (gameid == "ds") {
- continue;
- }
-#endif
-
if (description.empty())
description = "Unknown (target " + iter->_key + ", gameid " + gameid + ")";