Merge pull request #6749 from spycrab/qt_gcontrols_crash

Qt/GraphicsControls: Fix more random crashes
dolphin-emu · May 5, 2018 · 7986392 · 7986392
2 parents 5106724 + 300c397
commit 7986392
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/Source/Core/DolphinQt2/Config/Graphics/GraphicsBool.cpp b/Source/Core/DolphinQt2/Config/Graphics/GraphicsBool.cpp
@@ -20,7 +20,10 @@ GraphicsBool::GraphicsBool(const QString& label, const Config::ConfigInfo<bool>&
     QFont bf = font();
     bf.setBold(Config::GetActiveLayerForConfig(m_setting) != Config::LayerType::Base);
     setFont(bf);
+
+    bool old = blockSignals(true);
     setChecked(Config::Get(m_setting) ^ m_reverse);
+    blockSignals(old);
   });
 }
 

diff --git a/Source/Core/DolphinQt2/Config/Graphics/GraphicsChoice.cpp b/Source/Core/DolphinQt2/Config/Graphics/GraphicsChoice.cpp
@@ -19,7 +19,10 @@ GraphicsChoice::GraphicsChoice(const QStringList& options, const Config::ConfigI
     QFont bf = font();
     bf.setBold(Config::GetActiveLayerForConfig(m_setting) != Config::LayerType::Base);
     setFont(bf);
+
+    bool old = blockSignals(true);
     setCurrentIndex(Config::Get(m_setting));
+    blockSignals(old);
   });
 }
 

diff --git a/Source/Core/DolphinQt2/Config/Graphics/GraphicsRadio.cpp b/Source/Core/DolphinQt2/Config/Graphics/GraphicsRadio.cpp
@@ -18,7 +18,10 @@ GraphicsRadioInt::GraphicsRadioInt(const QString& label, const Config::ConfigInf
     QFont bf = font();
     bf.setBold(Config::GetActiveLayerForConfig(m_setting) != Config::LayerType::Base);
     setFont(bf);
+
+    bool old = blockSignals(true);
     setChecked(Config::Get(m_setting) == m_value);
+    blockSignals(old);
   });
 }