From f3278d7f8293bbca518415e4193d17e6c9efd2e7 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sat, 15 Apr 2006 13:21:02 +0000 Subject: Clear the transient domaing *after* running the launcher, not before, so that the graphics mode gets set correctly svn-id: r21907 --- base/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/main.cpp b/base/main.cpp index afa163625c..6fdcc55b36 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -315,13 +315,13 @@ extern "C" int scummvm_main(int argc, char *argv[]) { // Unless a game was specified, show the launcher dialog if (detector._targetName.empty()) { + running = launcherDialog(detector, 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(); - - running = launcherDialog(detector, system); } // FIXME: We're now looping the launcher. This, of course, doesn't -- cgit v1.2.3