[Scummvm-git-logs] scummvm master -> 77cfab947a366a0512cd06dd580da8011e435057

[sluicebox]

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

Summary:
90f836a342 GUI: Revert clearing debug flags on save/load dialog
77cfab947a BASE: Fix debug levels parameter name


Commit: 90f836a342c2a65311228700b11d0f922ca211f5
    https://github.com/scummvm/scummvm/commit/90f836a342c2a65311228700b11d0f922ca211f5
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2021-06-10T10:43:22-06:00

Commit Message:
GUI: Revert clearing debug flags on save/load dialog

Fixes clearing all debug flags set on the command line
whenever the ScummVM save/load dialog is displayed from
within a game.

This reverts commit 1c4e15599f4a88aaba903952f0cfb385a5d0f213

Changed paths:
    gui/saveload.cpp


diff --git a/gui/saveload.cpp b/gui/saveload.cpp
index 9cb6f266e7..8bd4f11c61 100644
--- a/gui/saveload.cpp
+++ b/gui/saveload.cpp
@@ -22,7 +22,6 @@
 
 #include "common/config-manager.h"
 #include "common/system.h"
-#include "common/debug-channels.h"
 
 #include "gui/saveload.h"
 #include "gui/saveload-dialog.h"
@@ -81,10 +80,6 @@ int SaveLoadChooser::runModalWithCurrentTarget() {
 	if (!g_engine)
 		error("No engine is currently active");
 
-	const MetaEngineDetection &metaEngineDetection = g_engine->getMetaEngineDetection();
-	DebugMan.debugFlagsClear();
-	DebugMan.debugFlagsRegister(metaEngineDetection.getDebugChannels());
-
 	return runModalWithMetaEngineAndTarget(g_engine->getMetaEngine(), ConfMan.getActiveDomainName());
 }
 


Commit: 77cfab947a366a0512cd06dd580da8011e435057
    https://github.com/scummvm/scummvm/commit/77cfab947a366a0512cd06dd580da8011e435057
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2021-06-10T10:47:42-06:00

Commit Message:
BASE: Fix debug levels parameter name

Changed paths:
    base/main.cpp


diff --git a/base/main.cpp b/base/main.cpp
index d91bd8c27d..4f6d3f2bbd 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -155,7 +155,7 @@ void saveLastLaunchedTarget(const Common::String &target) {
 }
 
 // TODO: specify the possible return values here
-static Common::Error runGame(const Plugin *plugin, const Plugin *enginePlugin, OSystem &system, const Common::String &edebuglevels) {
+static Common::Error runGame(const Plugin *plugin, const Plugin *enginePlugin, OSystem &system, const Common::String &debugLevels) {
 	assert(plugin);
 	assert(enginePlugin);
 
@@ -271,7 +271,7 @@ static Common::Error runGame(const Plugin *plugin, const Plugin *enginePlugin, O
 
 	// On creation the engine should have set up all debug levels so we can use
 	// the command line arguments here
-	Common::StringTokenizer tokenizer(edebuglevels, " ,");
+	Common::StringTokenizer tokenizer(debugLevels, " ,");
 	while (!tokenizer.empty()) {
 		Common::String token = tokenizer.nextToken();
 		if (token.equalsIgnoreCase("all"))