[Scummvm-git-logs] scummvm master -> 122ce598e8aa04708656953dbcfef48c3a8d7d91

[AndywinXp]

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:
122ce598e8 SCUMM: Clean-up default value registration for original_gui


Commit: 122ce598e8aa04708656953dbcfef48c3a8d7d91
    https://github.com/scummvm/scummvm/commit/122ce598e8aa04708656953dbcfef48c3a8d7d91
Author: AndywinXp (andywinxp at gmail.com)
Date: 2022-08-06T23:33:10+02:00

Commit Message:
SCUMM: Clean-up default value registration for original_gui

Changed paths:
    engines/scumm/scumm.cpp


diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index b16fdd20809..b7fc6f51ce3 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1377,12 +1377,11 @@ void ScummEngine::setupScumm(const Common::String &macResourceFile) {
 #ifdef ENABLE_SCUMM_7_8
 void ScummEngine_v7::setupScumm(const Common::String &macResourceFile) {
 
-	if (!ConfMan.hasKey("original_gui", _targetName)) {
-		ConfMan.setBool("original_gui", true);
+	ConfMan.registerDefault("original_gui", true);
+	if (ConfMan.hasKey("original_gui", _targetName)) {
+		_useOriginalGUI = ConfMan.getBool("original_gui");
 	}
 
-	_useOriginalGUI = ConfMan.getBool("original_gui");
-
 	// The object line toggle is always synchronized from the main game to
 	// our internal Game Options; at startup we do the opposite, since an user
 	// might change the toggle just before starting up the game...