summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorTilka <tilkax@gmail.com>2020-03-08 04:35:57 +0000
committerGitHub <noreply@github.com>2020-03-08 04:35:57 +0000
commita1fafdfd0eed40e8b09de82948207db46fed1397 (patch)
treef46cf197dcf0a7cbfa3215f64263e905da3695ba /Source/Core
parentdcaabcac03a0b54cdc67437748324800690fd11d (diff)
parentd1f6f12f786548efb392b30f31c0fad49f9dd0a2 (diff)
Merge pull request #8664 from CookiePLMonster/dolby-pro-logic-quality-fixup
AudioPane: Do not enable DPLII quality slider if DPLII is off
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/DolphinQt/Settings/AudioPane.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/Core/DolphinQt/Settings/AudioPane.cpp b/Source/Core/DolphinQt/Settings/AudioPane.cpp
index a43e845265..b7187a8f6d 100644
--- a/Source/Core/DolphinQt/Settings/AudioPane.cpp
+++ b/Source/Core/DolphinQt/Settings/AudioPane.cpp
@@ -337,7 +337,8 @@ void AudioPane::OnDspChanged()
m_dolby_pro_logic->setEnabled(AudioCommon::SupportsDPL2Decoder(backend) &&
!m_dsp_hle->isChecked());
- EnableDolbyQualityWidgets(AudioCommon::SupportsDPL2Decoder(backend) && !m_dsp_hle->isChecked());
+ EnableDolbyQualityWidgets(AudioCommon::SupportsDPL2Decoder(backend) && !m_dsp_hle->isChecked() &&
+ m_dolby_pro_logic->isChecked());
}
void AudioPane::OnBackendChanged()
@@ -346,7 +347,8 @@ void AudioPane::OnBackendChanged()
m_dolby_pro_logic->setEnabled(AudioCommon::SupportsDPL2Decoder(backend) &&
!m_dsp_hle->isChecked());
- EnableDolbyQualityWidgets(AudioCommon::SupportsDPL2Decoder(backend) && !m_dsp_hle->isChecked());
+ EnableDolbyQualityWidgets(AudioCommon::SupportsDPL2Decoder(backend) && !m_dsp_hle->isChecked() &&
+ m_dolby_pro_logic->isChecked());
if (m_latency_control_supported)
{
m_latency_label->setEnabled(AudioCommon::SupportsLatencyControl(backend));
@@ -382,7 +384,7 @@ void AudioPane::OnEmulationStateChanged(bool running)
if (AudioCommon::SupportsDPL2Decoder(SConfig::GetInstance().sBackend) && !m_dsp_hle->isChecked())
{
m_dolby_pro_logic->setEnabled(!running);
- EnableDolbyQualityWidgets(!running);
+ EnableDolbyQualityWidgets(!running && m_dolby_pro_logic->isChecked());
}
if (m_latency_control_supported)
{