From 4d1df20cfde9c48b469dfd0cb7b0eb28a3b49750 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 3 Sep 2008 08:57:39 +0000
Subject: 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)

svn-id: r34293
---
 base/main.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/base/main.cpp b/base/main.cpp
index 4283b6cacf..7337c94a40 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -263,13 +263,13 @@ extern "C" int scummvm_main(int argc, char *argv[]) {
 
 	// 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
-- 
cgit v1.2.3