From 8294d55a53d2afe45029a07f336f19bf6ead1b79 Mon Sep 17 00:00:00 2001
From: Bastien Bouclet
Date: Sun, 5 Jun 2016 11:43:07 +0200
Subject: BASE: Allow setting the debug flags from the configuration file

Useful for devices where passing command line arguments is not possible.
---
 base/main.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'base/main.cpp')

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
-- 
cgit v1.2.3