thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix regression brought by merge with vkeybs branch when command line parameters

Browse source 
were ignored. Thanks to eriktorbjorn for reporting.

svn-id: r35824
This commit is contained in:
Eugene Sandulenko 2009-01-11 12:07:37 +00:00
parent bc19c31d75
commit c326a91ecb
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
base/main.cpp
View file

@ -204,7 +204,7 @@ static Common::Error runGame(const EnginePlugin *plugin, OSystem &system, const
return result; return result;
} }
static void setupGraphics(OSystem &system) { static void setupGraphics(OSystem &system, bool clearDomain = false) {
system.beginGFXTransaction(); system.beginGFXTransaction();
// Set the user specified graphics mode (if any). // Set the user specified graphics mode (if any).
@ -227,7 +227,8 @@ static void setupGraphics(OSystem &system) {
// Discard any command line options. Those that affect the graphics // Discard any command line options. Those that affect the graphics
// mode and the others (like bootparam etc.) should not // mode and the others (like bootparam etc.) should not
// blindly be passed to the first game launched from the launcher. // blindly be passed to the first game launched from the launcher.
ConfMan.getDomain(Common::ConfigManager::kTransientDomain)->clear(); if (clearDomain)
ConfMan.getDomain(Common::ConfigManager::kTransientDomain)->clear();
// Set initial window caption // Set initial window caption
system.setWindowCaption(gScummVMFullVersion); system.setWindowCaption(gScummVMFullVersion);
@ -344,7 +345,7 @@ extern "C" int scummvm_main(int argc, char *argv[]) {
} }
// reset the graphics to default // reset the graphics to default
setupGraphics(system); setupGraphics(system, true);
launcherDialog(system); launcherDialog(system);
} }
PluginManager::instance().unloadPlugins(); PluginManager::instance().unloadPlugins();