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

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Wed Sep 3 10:57:40 CEST 2008


Revision: 34293
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34293&view=rev
Author:   fingolfin
Date:     2008-09-03 08:57:39 +0000 (Wed, 03 Sep 2008)

Log Message:
-----------
If launching scummvm with no game selected, clear the transient domain (and hence the effect of all command line args) before opening the launcher (may cause regressions)

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

Modified: scummvm/trunk/base/main.cpp
===================================================================
--- scummvm/trunk/base/main.cpp	2008-09-03 07:32:59 UTC (rev 34292)
+++ scummvm/trunk/base/main.cpp	2008-09-03 08:57:39 UTC (rev 34293)
@@ -263,13 +263,13 @@
 
 	// Unless a game was specified, show the launcher dialog
 	if (0 == ConfMan.getActiveDomain()) {
-		launcherDialog(system);
-
 		// 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();
+
+		launcherDialog(system);
 	}
 
 	// FIXME: We're now looping the launcher. This, of course, doesn't


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




More information about the Scummvm-git-logs mailing list