[Scummvm-git-logs] scummvm master -> 15b6a58c98762fd2a167dbe9d39ca2cbf8609f39

[bluegr]

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:
6edcd3c21c GUI: Fix displaying dynamic engine options widgets in the Edit Game dialog
15b6a58c98 GUI: Fix displaying static engine options widgets in the in-game options dialog


Commit: 6edcd3c21c20becb500a6585f2466c48cc825c06
    https://github.com/scummvm/scummvm/commit/6edcd3c21c20becb500a6585f2466c48cc825c06
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-08-23T00:07:11+03:00

Commit Message:
GUI: Fix displaying dynamic engine options widgets in the Edit Game dialog

Changed paths:
    gui/editgamedialog.cpp


diff --git a/gui/editgamedialog.cpp b/gui/editgamedialog.cpp
index 8dd5099773..2d5ed3ffee 100644
--- a/gui/editgamedialog.cpp
+++ b/gui/editgamedialog.cpp
@@ -192,7 +192,10 @@ EditGameDialog::EditGameDialog(const String &domain)
 
 		const MetaEngineDetection &metaEngineDetection = metaEnginePlugin->get<MetaEngineDetection>();
 		metaEngineDetection.registerDefaultSettings(_domain);
-		_engineOptions = metaEngineDetection.buildEngineOptionsWidgetStatic(tab, "GameOptions_Engine.Container", _domain);
+		if (enginePlugin)
+			_engineOptions = enginePlugin->get<MetaEngine>().buildEngineOptionsWidgetDynamic(tab, "GameOptions_Engine.Container", _domain);
+		if (!_engineOptions)
+			_engineOptions = metaEngineDetection.buildEngineOptionsWidgetStatic(tab, "GameOptions_Engine.Container", _domain);
 
 		if (_engineOptions) {
 			_engineOptions->setParentDialog(this);


Commit: 15b6a58c98762fd2a167dbe9d39ca2cbf8609f39
    https://github.com/scummvm/scummvm/commit/15b6a58c98762fd2a167dbe9d39ca2cbf8609f39
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-08-23T00:07:11+03:00

Commit Message:
GUI: Fix displaying static engine options widgets in the in-game options dialog

Changed paths:
    engines/dialogs.cpp


diff --git a/engines/dialogs.cpp b/engines/dialogs.cpp
index cd2ab8466a..8bc29bb87a 100644
--- a/engines/dialogs.cpp
+++ b/engines/dialogs.cpp
@@ -264,6 +264,7 @@ ConfigDialog::ConfigDialog() :
 
 	const Common::String &gameDomain = ConfMan.getActiveDomainName();
 	const MetaEngine *metaEngine = g_engine->getMetaEngine();
+	const MetaEngineDetection &metaEngineDetection = g_engine->getMetaEngineDetection();
 
 	// GUI:  Add tab widget
 	GUI::TabWidget *tab = new GUI::TabWidget(this, "GlobalConfig.TabWidget");
@@ -276,6 +277,8 @@ ConfigDialog::ConfigDialog() :
 
 	if (g_engine->hasFeature(Engine::kSupportsChangingOptionsDuringRuntime)) {
 		_engineOptions = metaEngine->buildEngineOptionsWidgetDynamic(tab, "GlobalConfig_Engine.Container", gameDomain);
+		if (!_engineOptions)
+			_engineOptions = metaEngineDetection.buildEngineOptionsWidgetStatic(tab, "GlobalConfig_Engine.Container", gameDomain);
 	}
 
 	if (_engineOptions) {