diff options
| author | Max Horn | 2008-09-03 08:57:39 +0000 |
|---|---|---|
| committer | Max Horn | 2008-09-03 08:57:39 +0000 |
| commit | 4d1df20cfde9c48b469dfd0cb7b0eb28a3b49750 (patch) | |
| tree | 03a57075a34fbc2eff71cedd8f93f0ac6b1d35d6 | |
| parent | c560bf1d720aca034c88ef01fe1541a69b3cc0fb (diff) | |
| download | scummvm-rg350-4d1df20cfde9c48b469dfd0cb7b0eb28a3b49750.tar.gz scummvm-rg350-4d1df20cfde9c48b469dfd0cb7b0eb28a3b49750.tar.bz2 scummvm-rg350-4d1df20cfde9c48b469dfd0cb7b0eb28a3b49750.zip | |
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
| -rw-r--r-- | base/main.cpp | 4 |
1 files 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 |