[Scummvm-cvs-logs] SF.net SVN: scummvm:[55222] scummvm/trunk/common/config-manager.cpp

[Bluddy at users.sourceforge.net]

Revision: 55222
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55222&view=rev
Author:   Bluddy
Date:     2011-01-13 11:30:37 +0000 (Thu, 13 Jan 2011)

Log Message:
-----------
CONFIGMANAGER: small changes to support old config files with no 'gameId' keys. As discussed on -devel.

Modified Paths:
--------------
    scummvm/trunk/common/config-manager.cpp

Modified: scummvm/trunk/common/config-manager.cpp
===================================================================
--- scummvm/trunk/common/config-manager.cpp	2011-01-13 03:25:57 UTC (rev 55221)
+++ scummvm/trunk/common/config-manager.cpp	2011-01-13 11:30:37 UTC (rev 55222)
@@ -131,6 +131,12 @@
 		_gameDomains[domainName] = domain;
 
 		_domainSaveOrder.push_back(domainName);
+			
+			// Check if we have the same misc domain. For older config files
+			// we could have 'ghost' domains with the same name, so delete
+			// the ghost domain
+			if (_miscDomains.contains(domainName))
+				_miscDomains.erase(domainName);
 	} else {
 		// Otherwise it's a miscellaneous domain
 		if (_miscDomains.contains(domainName))
@@ -355,10 +361,10 @@
 	if (domName == kKeymapperDomain)
 		return &_keymapperDomain;
 #endif
+	if (_gameDomains.contains(domName))
+		return &_gameDomains[domName];
 	if (_miscDomains.contains(domName))
 		return &_miscDomains[domName];
-	if (_gameDomains.contains(domName))
-		return &_gameDomains[domName];
 
 	return 0;
 }
@@ -375,10 +381,10 @@
 	if (domName == kKeymapperDomain)
 		return &_keymapperDomain;
 #endif
+	if (_gameDomains.contains(domName))
+		return &_gameDomains[domName];
 	if (_miscDomains.contains(domName))
 		return &_miscDomains[domName];
-	if (_gameDomains.contains(domName))
-		return &_gameDomains[domName];
 
 	return 0;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.