[Scummvm-cvs-logs] scummvm master -> 8294d55a53d2afe45029a07f336f19bf6ead1b79

bgK bastien.bouclet at gmail.com
Sun Jun 5 11:52:56 CEST 2016


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
8294d55a53 BASE: Allow setting the debug flags from the configuration file


Commit: 8294d55a53d2afe45029a07f336f19bf6ead1b79
    https://github.com/scummvm/scummvm/commit/8294d55a53d2afe45029a07f336f19bf6ead1b79
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2016-06-05T11:49:40+02:00

Commit Message:
BASE: Allow setting the debug flags from the configuration file

Useful for devices where passing command line arguments is not possible.

Changed paths:
    base/main.cpp



diff --git a/base/main.cpp b/base/main.cpp
index 1df90c2..349f719 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






More information about the Scummvm-git-logs mailing list