diff options
| author | Max Horn | 2004-12-25 19:03:13 +0000 |
|---|---|---|
| committer | Max Horn | 2004-12-25 19:03:13 +0000 |
| commit | 2941d595bd18d9a64e33b20658e007709db9afda (patch) | |
| tree | 87b50ab9a2af254dc9b06dab6f0c8b5a822e80df /base | |
| parent | fec3df209601b812034fafed53ef74b7ee732512 (diff) | |
| download | scummvm-rg350-2941d595bd18d9a64e33b20658e007709db9afda.tar.gz scummvm-rg350-2941d595bd18d9a64e33b20658e007709db9afda.tar.bz2 scummvm-rg350-2941d595bd18d9a64e33b20658e007709db9afda.zip | |
Make loading the config file explicit
svn-id: r16317
Diffstat (limited to 'base')
| -rw-r--r-- | base/main.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/base/main.cpp b/base/main.cpp index 0dfa193fff..afb70ad923 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -345,7 +345,9 @@ extern "C" int scummvm_main(GameDetector &detector, int argc, char *argv[]) { } } if (cfgFilename != NULL) - ConfMan.switchFile(cfgFilename); + ConfMan.loadConfigFile(cfgFilename); + else + ConfMan.loadDefaultConfigFile(); // Update the config file ConfMan.set("versioninfo", gScummVMVersion, Common::ConfigManager::kApplicationDomain); |