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

Merge pull request #6032 from stenzek/postprocess-save 

VideoConfigDiag: Fix bug where postprocessing shader wasn't saved to INI
This commit is contained in:
Stenzek 2017-09-10 16:05:03 +10:00 committed by GitHub
parent ee51ba6399 0de31d87bd
commit 7141e6d57e
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Core/DolphinWX/VideoConfigDiag.cpp
View File

@ -1275,18 +1275,23 @@ void VideoConfigDiag::PopulatePostProcessingShaders()
choice_ppshader->AppendString(StrToWxStr(shader)); choice_ppshader->AppendString(StrToWxStr(shader));
} }
if (!choice_ppshader->SetStringSelection(StrToWxStr(vconfig.sPostProcessingShader))) if (vconfig.sPostProcessingShader.empty())
{
// Select (off) value in choice.
choice_ppshader->Select(0);
}
else if (!choice_ppshader->SetStringSelection(StrToWxStr(vconfig.sPostProcessingShader)))
{ {
// Invalid shader, reset it to default // Invalid shader, reset it to default
choice_ppshader->Select(0); choice_ppshader->Select(0);
if (vconfig.iStereoMode == STEREO_ANAGLYPH) if (vconfig.iStereoMode == STEREO_ANAGLYPH)
{ {
Config::SetCurrent(Config::GFX_ENHANCE_POST_SHADER, std::string("dubois")); Config::SetBaseOrCurrent(Config::GFX_ENHANCE_POST_SHADER, std::string("dubois"));
choice_ppshader->SetStringSelection(StrToWxStr(vconfig.sPostProcessingShader)); choice_ppshader->SetStringSelection(StrToWxStr(vconfig.sPostProcessingShader));
} }
else else
Config::SetCurrent(Config::GFX_ENHANCE_POST_SHADER, std::string("")); Config::SetBaseOrCurrent(Config::GFX_ENHANCE_POST_SHADER, std::string(""));
} }
// Should the configuration button be loaded by default? // Should the configuration button be loaded by default?