[Scummvm-cvs-logs] SF.net SVN: scummvm:[50710] scummvm/trunk/engines/scumm/detection.cpp

[lordhoto at users.sourceforge.net]

Revision: 50710
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50710&view=rev
Author:   lordhoto
Date:     2010-07-05 21:18:25 +0000 (Mon, 05 Jul 2010)

Log Message:
-----------
Prevent SCUMM from adding gui options based on user flags into the config file (regression from r50706).

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/detection.cpp

Modified: scummvm/trunk/engines/scumm/detection.cpp
===================================================================
--- scummvm/trunk/engines/scumm/detection.cpp	2010-07-05 20:36:43 UTC (rev 50709)
+++ scummvm/trunk/engines/scumm/detection.cpp	2010-07-05 21:18:25 UTC (rev 50710)
@@ -1005,6 +1005,10 @@
 		debug(1, "Using MD5 '%s'", res.md5.c_str());
 	}
 
+	// If the GUI options were updated, we catch this here and update them in the users config
+	// file transparently.
+	Common::updateGameGUIOptions(res.game.guioptions, getGameGUIOptionsDescriptionLanguage(res.language));
+
 	// Check for a user override of the platform. We allow the user to override
 	// the platform, to make it possible to add games which are not yet in
 	// our MD5 database but require a specific platform setting.
@@ -1021,11 +1025,6 @@
 	// TODO: Maybe allow the null driver, too?
 	if (res.game.platform == Common::kPlatformFMTowns && res.game.version == 3)
 		res.game.midi = MDT_TOWNS;
-
-	// If the GUI options were updated, we catch this here and update them in the users config
-	// file transparently.
-	Common::updateGameGUIOptions(res.game.guioptions, getGameGUIOptionsDescriptionLanguage(res.language));
-
 	// Finally, we have massaged the GameDescriptor to our satisfaction, and can
 	// instantiate the appropriate game engine. Hooray!
 	switch (res.game.version) {


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