From 68b8cd1e7c56a8c14a9e4e97528fa5e5e38f6b28 Mon Sep 17 00:00:00 2001 From: Techjar Date: Sat, 30 Jun 2018 14:59:19 -0400 Subject: [PATCH] Qt/EnhancementsWidget: Fix post-processing options not being disabled when they should --- .../Config/Graphics/EnhancementsWidget.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Source/Core/DolphinQt2/Config/Graphics/EnhancementsWidget.cpp b/Source/Core/DolphinQt2/Config/Graphics/EnhancementsWidget.cpp index 752770ab9a..98bb94a37e 100644 --- a/Source/Core/DolphinQt2/Config/Graphics/EnhancementsWidget.cpp +++ b/Source/Core/DolphinQt2/Config/Graphics/EnhancementsWidget.cpp @@ -183,14 +183,18 @@ void EnhancementsWidget::LoadPPShaders() m_pp_effect->setToolTip(supports_postprocessing ? QStringLiteral("") : tr("%1 doesn't support this feature.") - .arg(QString::fromStdString(g_video_backend->GetDisplayName()))); + .arg(tr(g_video_backend->GetDisplayName().c_str()))); PostProcessingShaderConfiguration pp_shader; - if (selected_shader != "(off)") + if (selected_shader != "(off)" && supports_postprocessing) { pp_shader.LoadShader(selected_shader); m_configure_pp_effect->setEnabled(pp_shader.HasOptions()); } + else + { + m_configure_pp_effect->setEnabled(false); + } } void EnhancementsWidget::LoadSettings() @@ -254,8 +258,9 @@ void EnhancementsWidget::SaveSettings() Config::SetBaseOrCurrent(Config::GFX_SSAA, is_ssaa); - Config::SetBaseOrCurrent(Config::GFX_ENHANCE_POST_SHADER, - m_pp_effect->currentText().toStdString()); + Config::SetBaseOrCurrent( + Config::GFX_ENHANCE_POST_SHADER, + m_pp_effect->currentIndex() == 0 ? "(off)" : m_pp_effect->currentText().toStdString()); PostProcessingShaderConfiguration pp_shader; if (Config::Get(Config::GFX_ENHANCE_POST_SHADER) != "(off)")