Merge pull request #13232 from TryTwo/PR_hotfix

Qt crash hotfix
dolphin-emu · Dec 23, 2024 · f9ce2b9 · f9ce2b9
2 parents c528a70 + 27ac5fa
commit f9ce2b9
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 36 deletions.
diff --git a/Source/Core/DolphinQt/Config/ConfigControls/ConfigBool.h b/Source/Core/DolphinQt/Config/ConfigControls/ConfigBool.h
@@ -6,11 +6,7 @@
 #include "DolphinQt/Config/ConfigControls/ConfigControl.h"
 #include "DolphinQt/Config/ToolTipControls/ToolTipCheckBox.h"
 
-namespace Config
-{
-template <typename T>
-class Info;
-}
+#include "Common/Config/ConfigInfo.h"
 
 class ConfigBool final : public ConfigControl<ToolTipCheckBox>
 {
@@ -26,6 +22,6 @@ class ConfigBool final : public ConfigControl<ToolTipCheckBox>
 private:
   void Update();
 
-  const Config::Info<bool>& m_setting;
+  const Config::Info<bool> m_setting;
   bool m_reverse;
 };
diff --git a/Source/Core/DolphinQt/Config/ConfigControls/ConfigChoice.h b/Source/Core/DolphinQt/Config/ConfigControls/ConfigChoice.h
@@ -10,11 +10,7 @@
 #include "DolphinQt/Config/ConfigControls/ConfigControl.h"
 #include "DolphinQt/Config/ToolTipControls/ToolTipComboBox.h"
 
-namespace Config
-{
-template <typename T>
-class Info;
-}
+#include "Common/Config/ConfigInfo.h"
 
 class ConfigChoice final : public ConfigControl<ToolTipComboBox>
 {
@@ -48,7 +44,7 @@ class ConfigStringChoice final : public ConfigControl<ToolTipComboBox>
 private:
   void Update(int index);
 
-  const Config::Info<std::string>& m_setting;
+  const Config::Info<std::string> m_setting;
   bool m_text_is_data = false;
 };
 

diff --git a/Source/Core/DolphinQt/Config/ConfigControls/ConfigFloatSlider.h b/Source/Core/DolphinQt/Config/ConfigControls/ConfigFloatSlider.h
@@ -6,11 +6,7 @@
 #include "DolphinQt/Config/ConfigControls/ConfigControl.h"
 #include "DolphinQt/Config/ToolTipControls/ToolTipSlider.h"
 
-namespace Config
-{
-template <typename T>
-class Info;
-}
+#include "Common/Config/ConfigInfo.h"
 
 // Automatically converts an int slider into a float one.
 // Do not read the int values or ranges directly from it.
@@ -31,5 +27,5 @@ class ConfigFloatSlider final : public ConfigControl<ToolTipSlider>
 private:
   float m_minimum;
   float m_step;
-  const Config::Info<float>& m_setting;
+  const Config::Info<float> m_setting;
 };
diff --git a/Source/Core/DolphinQt/Config/ConfigControls/ConfigInteger.h b/Source/Core/DolphinQt/Config/ConfigControls/ConfigInteger.h
@@ -9,11 +9,7 @@
 #include "DolphinQt/Config/ConfigControls/ConfigControl.h"
 #include "DolphinQt/Config/ToolTipControls/ToolTipSpinBox.h"
 
-namespace Config
-{
-template <typename T>
-class Info;
-}
+#include "Common/Config/ConfigInfo.h"
 
 class ConfigInteger final : public ConfigControl<ToolTipSpinBox>
 {
@@ -29,7 +25,7 @@ class ConfigInteger final : public ConfigControl<ToolTipSpinBox>
   void OnConfigChanged() override;
 
 private:
-  const Config::Info<int>& m_setting;
+  const Config::Info<int> m_setting;
 };
 
 class ConfigIntegerLabel final : public QLabel

diff --git a/Source/Core/DolphinQt/Config/ConfigControls/ConfigRadio.h b/Source/Core/DolphinQt/Config/ConfigControls/ConfigRadio.h
@@ -6,11 +6,7 @@
 #include "DolphinQt/Config/ConfigControls/ConfigControl.h"
 #include "DolphinQt/Config/ToolTipControls/ToolTipRadioButton.h"
 
-namespace Config
-{
-template <typename T>
-class Info;
-}
+#include "Common/Config/ConfigInfo.h"
 
 class ConfigRadioInt final : public ConfigControl<ToolTipRadioButton>
 {
@@ -31,6 +27,6 @@ class ConfigRadioInt final : public ConfigControl<ToolTipRadioButton>
 private:
   void Update();
 
-  const Config::Info<int>& m_setting;
+  const Config::Info<int> m_setting;
   int m_value;
 };
diff --git a/Source/Core/DolphinQt/Config/ConfigControls/ConfigSlider.h b/Source/Core/DolphinQt/Config/ConfigControls/ConfigSlider.h
@@ -9,11 +9,7 @@
 #include "DolphinQt/Config/ConfigControls/ConfigControl.h"
 #include "DolphinQt/Config/ToolTipControls/ToolTipSlider.h"
 
-namespace Config
-{
-template <typename T>
-class Info;
-}
+#include "Common/Config/ConfigInfo.h"
 
 class ConfigSlider final : public ConfigControl<ToolTipSlider>
 {
@@ -29,7 +25,7 @@ class ConfigSlider final : public ConfigControl<ToolTipSlider>
   void OnConfigChanged() override;
 
 private:
-  const Config::Info<int>& m_setting;
+  const Config::Info<int> m_setting;
 };
 
 class ConfigSliderLabel final : public QLabel