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

[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:
dedeb489f2 GUI: And even more properly fix the shader override


Commit: dedeb489f2e5fd7a905fd2c296c47f23ace73e07
    https://github.com/scummvm/scummvm/commit/dedeb489f2e5fd7a905fd2c296c47f23ace73e07
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-10-23T15:43:22+02:00

Commit Message:
GUI: And even more properly fix the shader override

Changed paths:
    gui/options.cpp


diff --git a/gui/options.cpp b/gui/options.cpp
index 75fac20a42a..1a48e0f7eb8 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -699,7 +699,6 @@ void OptionsDialog::apply() {
 			ConfMan.removeKey("stretch_mode", _domain);
 			ConfMan.removeKey("scaler", _domain);
 			ConfMan.removeKey("scale_factor", _domain);
-			ConfMan.removeKey("shader", _domain);
 			ConfMan.removeKey("render_mode", _domain);
 			ConfMan.removeKey("renderer", _domain);
 			ConfMan.removeKey("antialiasing", _domain);
@@ -721,7 +720,11 @@ void OptionsDialog::apply() {
 
 		if (!ConfMan.hasKey("shader", _domain) || shader != ConfMan.get("shader", _domain))
 			graphicsModeChanged = true;
-		ConfMan.set("shader", shader.encode(), _domain);
+
+		if (_enableGraphicSettings)
+			ConfMan.set("shader", shader.encode(), _domain);
+		else
+			ConfMan.removeKey("shader", _domain);
 
 		_shader->setFontColor(ThemeEngine::FontColor::kFontColorNormal);
 	}