[Scummvm-git-logs] scummvm master -> 272f884419895547c95cd7551de2345fc0dd41db

[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:
272f884419 GUI: Fix crash in shader controls


Commit: 272f884419895547c95cd7551de2345fc0dd41db
    https://github.com/scummvm/scummvm/commit/272f884419895547c95cd7551de2345fc0dd41db
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-09-20T09:49:09+02:00

Commit Message:
GUI: Fix crash in shader controls

Changed paths:
    gui/options.cpp


diff --git a/gui/options.cpp b/gui/options.cpp
index 6be1a8460b6..810712872cc 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -424,19 +424,21 @@ void OptionsDialog::build() {
 	}
 
 	// Shader options
-	enableShaderControls(g_system->hasFeature(OSystem::kFeatureShaders));
+	if (_shader) {
+		enableShaderControls(g_system->hasFeature(OSystem::kFeatureShaders));
 
-	if (g_system->hasFeature(OSystem::kFeatureShaders)) {
-		Common::String shader(ConfMan.get("shader", _domain));
-		if (ConfMan.isKeyTemporary("shader")) {
-			_shader->setFontColor(ThemeEngine::FontColor::kFontColorOverride);
-		}
-		if (shader.empty() || shader == "default" || !ConfMan.hasKey("shader", _domain)) {
-			_shader->setLabel(_c("None", "shader"));
-			_shaderClearButton->setEnabled(false);
-		} else {
-			_shader->setLabel(shader);
-			_shaderClearButton->setEnabled(true);
+		if (g_system->hasFeature(OSystem::kFeatureShaders)) {
+			Common::String shader(ConfMan.get("shader", _domain));
+			if (ConfMan.isKeyTemporary("shader")) {
+				_shader->setFontColor(ThemeEngine::FontColor::kFontColorOverride);
+			}
+			if (shader.empty() || shader == "default" || !ConfMan.hasKey("shader", _domain)) {
+				_shader->setLabel(_c("None", "shader"));
+				_shaderClearButton->setEnabled(false);
+			} else {
+				_shader->setLabel(shader);
+				_shaderClearButton->setEnabled(true);
+			}
 		}
 	}