ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt/EnhancementsWidget: Fix post-processing options not being disabled when they should

This commit is contained in:
Techjar 2018-06-30 14:59:19 -04:00
parent e23a2e3063
commit 68b8cd1e7c
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/DolphinQt2/Config/Graphics/EnhancementsWidget.cpp
View File

@ -183,14 +183,18 @@ void EnhancementsWidget::LoadPPShaders()
m_pp_effect->setToolTip(supports_postprocessing ? m_pp_effect->setToolTip(supports_postprocessing ?
QStringLiteral("") : QStringLiteral("") :
tr("%1 doesn't support this feature.") 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; PostProcessingShaderConfiguration pp_shader;
if (selected_shader != "(off)") if (selected_shader != "(off)" && supports_postprocessing)
{ {
pp_shader.LoadShader(selected_shader); pp_shader.LoadShader(selected_shader);
m_configure_pp_effect->setEnabled(pp_shader.HasOptions()); m_configure_pp_effect->setEnabled(pp_shader.HasOptions());
} }
else
{
m_configure_pp_effect->setEnabled(false);
}
} }
void EnhancementsWidget::LoadSettings() void EnhancementsWidget::LoadSettings()
@ -254,8 +258,9 @@ void EnhancementsWidget::SaveSettings()
Config::SetBaseOrCurrent(Config::GFX_SSAA, is_ssaa); Config::SetBaseOrCurrent(Config::GFX_SSAA, is_ssaa);
Config::SetBaseOrCurrent(Config::GFX_ENHANCE_POST_SHADER, Config::SetBaseOrCurrent(
m_pp_effect->currentText().toStdString()); Config::GFX_ENHANCE_POST_SHADER,
m_pp_effect->currentIndex() == 0 ? "(off)" : m_pp_effect->currentText().toStdString());
PostProcessingShaderConfiguration pp_shader; PostProcessingShaderConfiguration pp_shader;
if (Config::Get(Config::GFX_ENHANCE_POST_SHADER) != "(off)") if (Config::Get(Config::GFX_ENHANCE_POST_SHADER) != "(off)")