[Scummvm-git-logs] scummvm master -> ebb76cb40152500795bb342115f44ca28352a244

[sev-]

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:
ebb76cb401 GUI: Fix crash with ExtraGuiOptionsDialog


Commit: ebb76cb40152500795bb342115f44ca28352a244
    https://github.com/scummvm/scummvm/commit/ebb76cb40152500795bb342115f44ca28352a244
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2024-06-14T21:40:38+02:00

Commit Message:
GUI: Fix crash with ExtraGuiOptionsDialog

Changed paths:
    engines/dialogs.cpp
    engines/dialogs.h


diff --git a/engines/dialogs.cpp b/engines/dialogs.cpp
index 3cc3b107449..85a27090bef 100644
--- a/engines/dialogs.cpp
+++ b/engines/dialogs.cpp
@@ -414,7 +414,7 @@ void ConfigDialog::apply() {
 }
 
 ExtraGuiOptionsWidget::ExtraGuiOptionsWidget(GuiObject *containerBoss, const Common::String &name, const Common::String &domain, const ExtraGuiOptions &options) :
-		OptionsContainerWidget(containerBoss, name, dialogLayout(domain), domain),
+		OptionsContainerWidget(containerBoss, name, "ExtraGuiOptionsDialog", domain),
 		_options(options) {
 
 	for (uint i = 0; i < _options.size(); i++) {
@@ -461,14 +461,6 @@ void ExtraGuiOptionsWidget::handleCommand(GUI::CommandSender *sender, uint32 cmd
 	}
 }
 
-Common::String ExtraGuiOptionsWidget::dialogLayout(const Common::String &domain) {
-	if (ConfMan.getActiveDomainName().equals(domain)) {
-		return "GlobalConfig_Engine_Container";
-	} else {
-		return "GameOptions_Game_Container";
-	}
-}
-
 void ExtraGuiOptionsWidget::load() {
 	// Set the state of engine-specific checkboxes
 	for (uint j = 0; j < _options.size() && j < _checkboxes.size(); ++j) {
diff --git a/engines/dialogs.h b/engines/dialogs.h
index 67d61736767..d8e9210a5f7 100644
--- a/engines/dialogs.h
+++ b/engines/dialogs.h
@@ -112,8 +112,6 @@ protected:
 private:
 	typedef Common::Array<CheckboxWidget *> CheckboxWidgetList;
 
-	static Common::String dialogLayout(const Common::String &domain);
-
 	ExtraGuiOptions _options;
 	CheckboxWidgetList _checkboxes;
 };