[Scummvm-cvs-logs] SF.net SVN: scummvm:[35824] scummvm/trunk/base/main.cpp

[sev at users.sourceforge.net]

Revision: 35824
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35824&view=rev
Author:   sev
Date:     2009-01-11 12:07:37 +0000 (Sun, 11 Jan 2009)

Log Message:
-----------
Fix regression brought by merge with vkeybs branch when command line parameters
were ignored. Thanks to eriktorbjorn for reporting.

Modified Paths:
--------------
    scummvm/trunk/base/main.cpp

Modified: scummvm/trunk/base/main.cpp
===================================================================
--- scummvm/trunk/base/main.cpp	2009-01-11 11:16:37 UTC (rev 35823)
+++ scummvm/trunk/base/main.cpp	2009-01-11 12:07:37 UTC (rev 35824)
@@ -204,7 +204,7 @@
 	return result;
 }
 
-static void setupGraphics(OSystem &system) {
+static void setupGraphics(OSystem &system, bool clearDomain = false) {
 	
 	system.beginGFXTransaction();
 		// Set the user specified graphics mode (if any).
@@ -227,7 +227,8 @@
 	// Discard any command line options. Those that affect the graphics
 	// mode and the others (like bootparam etc.) should not
 	// blindly be passed to the first game launched from the launcher.
-	ConfMan.getDomain(Common::ConfigManager::kTransientDomain)->clear();
+	if (clearDomain)
+		ConfMan.getDomain(Common::ConfigManager::kTransientDomain)->clear();
 
 	// Set initial window caption
 	system.setWindowCaption(gScummVMFullVersion);
@@ -344,7 +345,7 @@
 		}
 		
 		// reset the graphics to default
-		setupGraphics(system);
+		setupGraphics(system, true);
 		launcherDialog(system);
 	}
 	PluginManager::instance().unloadPlugins();


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