Merge pull request #8664 from CookiePLMonster/dolby-pro-logic-quality…

…-fixup AudioPane: Do not enable DPLII quality slider if DPLII is off
dolphin-emu · Mar 8, 2020 · a1fafdf · a1fafdf
2 parents dcaabca + d1f6f12
commit a1fafdf
Showing 1 changed file with 5 additions and 3 deletions.
diff --git 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)
   {