aboutsummaryrefslogtreecommitdiff
path: root/base/main.cpp
diff options
context:
space:
mode:
authorBastien Bouclet2016-06-05 11:43:07 +0200
committerBastien Bouclet2016-06-05 11:49:40 +0200
commit8294d55a53d2afe45029a07f336f19bf6ead1b79 (patch)
treec9f11cd3cb788a66f139b50aad5664beb7dc73aa /base/main.cpp
parentc4e8ea9e54281eff30572b6456d95a7fb55a74c5 (diff)
downloadscummvm-rg350-8294d55a53d2afe45029a07f336f19bf6ead1b79.tar.gz
scummvm-rg350-8294d55a53d2afe45029a07f336f19bf6ead1b79.tar.bz2
scummvm-rg350-8294d55a53d2afe45029a07f336f19bf6ead1b79.zip
BASE: Allow setting the debug flags from the configuration file
Useful for devices where passing command line arguments is not possible.
Diffstat (limited to 'base/main.cpp')
-rw-r--r--base/main.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/base/main.cpp b/base/main.cpp
index 1df90c2d57..349f719ed5 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -388,7 +388,8 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
if (settings.contains("debugflags")) {
specialDebug = settings["debugflags"];
settings.erase("debugflags");
- }
+ } else if (ConfMan.hasKey("debugflags"))
+ specialDebug = ConfMan.get("debugflags");
PluginManager::instance().init();
PluginManager::instance().loadAllPlugins(); // load plugins for cached plugin manager