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

[lordhoto at users.sourceforge.net]

Revision: 34637
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34637&view=rev
Author:   lordhoto
Date:     2008-09-23 16:40:41 +0000 (Tue, 23 Sep 2008)

Log Message:
-----------
Fix for bug #2120780 "GUI: gui-theme command-line option ignored", '-f' and '-g' command line switch behavior.

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

Modified: scummvm/trunk/base/main.cpp
===================================================================
--- scummvm/trunk/base/main.cpp	2008-09-23 12:34:02 UTC (rev 34636)
+++ scummvm/trunk/base/main.cpp	2008-09-23 16:40:41 UTC (rev 34637)
@@ -68,6 +68,17 @@
 			system.setFeatureState(OSystem::kFeatureFullscreenMode, ConfMan.getBool("fullscreen"));
 	system.endGFXTransaction();
 
+	// When starting up launcher for the first time, the user might have specified
+	// a --gui-theme option, to allow that option to be working, we need to initialize
+	// GUI here.
+	// FIXME: Find a nicer way to allow --gui-theme to be working
+	GUI::NewGui::instance();
+
+	// 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();
+
 	// Set initial window caption
 	system.setWindowCaption(gScummVMFullVersion);
 
@@ -275,15 +286,8 @@
 	system.initBackend();
 
 	// Unless a game was specified, show the launcher dialog
-	if (0 == ConfMan.getActiveDomain()) {
-		// Discard any command line options. Those that affect the graphics
-		// mode etc. already have should have been handled by the backend at
-		// this point. 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 (0 == ConfMan.getActiveDomain())
 		launcherDialog(system);
-	}
 
 	// FIXME: We're now looping the launcher. This, of course, doesn't
 	// work as well as it should. In theory everything should be destroyed


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