Compute the value GameDetector::_gameid *immediately* after _targetName has been set (this ensures that both are always in sync)

svn-id: r21566

1 files changed, 5 insertions, 5 deletions

diff --git a/base/gameDetector.cpp b/base/gameDetector.cpp
index 4ce65973de..57de0871e4 100644
--- a/base/gameDetector.cpp
+++ b/base/gameDetector.cpp
@@ -651,6 +651,11 @@ void GameDetector::processSettings(Common::StringMap &settings) {
 void GameDetector::setTarget(const String &target) {
 	_targetName = target;
 	ConfMan.setActiveDomain(target);
+
+	if (ConfMan.hasKey("gameid"))
+		_gameid = ConfMan.get("gameid");
+	else
+		_gameid = _targetName;
 }
 
 bool GameDetector::detectMain() {
@@ -659,11 +664,6 @@ bool GameDetector::detectMain() {
 		return false;
 	}
 
-	if (ConfMan.hasKey("gameid"))
-		_gameid = ConfMan.get("gameid");
-	else
-		_gameid = _targetName;
-
 	printf("Looking for %s\n", _gameid.c_str());
 	GameDescriptor game = findGame(_gameid, &_plugin);