Merge pull request #4764 from aldelaro5/crash-fix-inputconfig

InputConfigDialog pass the device_cbox to the wiimote extension dialogs
dolphin-emu · Feb 10, 2017 · 96e83b5 · 96e83b5
2 parents 3cbbd48 + 334e33d
commit 96e83b5
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 15 deletions.
diff --git a/Source/Core/DolphinWX/Input/ClassicInputConfigDiag.cpp b/Source/Core/DolphinWX/Input/ClassicInputConfigDiag.cpp
@@ -8,11 +8,15 @@
 #include "Core/HW/WiimoteEmu/WiimoteEmu.h"
 
 ClassicInputConfigDialog::ClassicInputConfigDialog(wxWindow* const parent, InputConfig& config,
-                                                   const wxString& name, const int port_num)
+                                                   const wxString& name,
+                                                   wxComboBox* device_cbox_parent,
+                                                   const int port_num)
     : InputConfigDialog(parent, config, name, port_num)
 {
   const int space5 = FromDIP(5);
 
+  device_cbox = device_cbox_parent;
+
   auto* const group_box_buttons = new ControlGroupBox(
       Wiimote::GetClassicGroup(port_num, WiimoteEmu::ClassicGroup::Buttons), this, this);
   auto* const group_box_dpad = new ControlGroupBox(

diff --git a/Source/Core/DolphinWX/Input/ClassicInputConfigDiag.h b/Source/Core/DolphinWX/Input/ClassicInputConfigDiag.h
@@ -6,9 +6,11 @@
 
 #include "DolphinWX/Input/InputConfigDiag.h"
 
+class wxComboBox;
+
 class ClassicInputConfigDialog final : public InputConfigDialog
 {
 public:
   ClassicInputConfigDialog(wxWindow* parent, InputConfig& config, const wxString& name,
-                           int port_num = 0);
+                           wxComboBox* device_cbox_parent, int port_num = 0);
 };
diff --git a/Source/Core/DolphinWX/Input/DrumsInputConfigDiag.cpp b/Source/Core/DolphinWX/Input/DrumsInputConfigDiag.cpp
@@ -8,11 +8,14 @@
 #include "Core/HW/WiimoteEmu/WiimoteEmu.h"
 
 DrumsInputConfigDialog::DrumsInputConfigDialog(wxWindow* const parent, InputConfig& config,
-                                               const wxString& name, const int port_num)
+                                               const wxString& name, wxComboBox* device_cbox_parent,
+                                               const int port_num)
     : InputConfigDialog(parent, config, name, port_num)
 {
   const int space5 = FromDIP(5);
 
+  device_cbox = device_cbox_parent;
+
   auto* const group_box_buttons = new ControlGroupBox(
       Wiimote::GetDrumsGroup(port_num, WiimoteEmu::DrumsGroup::Buttons), this, this);
   auto* const group_box_pads = new ControlGroupBox(

diff --git a/Source/Core/DolphinWX/Input/DrumsInputConfigDiag.h b/Source/Core/DolphinWX/Input/DrumsInputConfigDiag.h
@@ -6,9 +6,11 @@
 
 #include "DolphinWX/Input/InputConfigDiag.h"
 
+class wxComboBox;
+
 class DrumsInputConfigDialog final : public InputConfigDialog
 {
 public:
   DrumsInputConfigDialog(wxWindow* parent, InputConfig& config, const wxString& name,
-                         int port_num = 0);
+                         wxComboBox* device_cbox_parent, int port_num = 0);
 };
diff --git a/Source/Core/DolphinWX/Input/GuitarInputConfigDiag.cpp b/Source/Core/DolphinWX/Input/GuitarInputConfigDiag.cpp
@@ -8,11 +8,14 @@
 #include "Core/HW/WiimoteEmu/WiimoteEmu.h"
 
 GuitarInputConfigDialog::GuitarInputConfigDialog(wxWindow* const parent, InputConfig& config,
-                                                 const wxString& name, const int port_num)
+                                                 const wxString& name,
+                                                 wxComboBox* device_cbox_parent, const int port_num)
     : InputConfigDialog(parent, config, name, port_num)
 {
   const int space5 = FromDIP(5);
 
+  device_cbox = device_cbox_parent;
+
   auto* const group_box_buttons = new ControlGroupBox(
       Wiimote::GetGuitarGroup(port_num, WiimoteEmu::GuitarGroup::Buttons), this, this);
   auto* const group_left_strum = new ControlGroupBox(

diff --git a/Source/Core/DolphinWX/Input/GuitarInputConfigDiag.h b/Source/Core/DolphinWX/Input/GuitarInputConfigDiag.h
@@ -6,9 +6,11 @@
 
 #include "DolphinWX/Input/InputConfigDiag.h"
 
+class wxComboBox;
+
 class GuitarInputConfigDialog final : public InputConfigDialog
 {
 public:
   GuitarInputConfigDialog(wxWindow* parent, InputConfig& config, const wxString& name,
-                          int port_num = 0);
+                          wxComboBox* device_cbox_parent, int port_num = 0);
 };
diff --git a/Source/Core/DolphinWX/Input/InputConfigDiag.cpp b/Source/Core/DolphinWX/Input/InputConfigDiag.cpp
@@ -71,31 +71,34 @@ void InputConfigDialog::ConfigExtension(wxCommandEvent& event)
   {
   case WiimoteEmu::EXT_NUNCHUK:
   {
-    NunchukInputConfigDialog dlg(this, m_config, _("Nunchuk Configuration"), m_port_num);
+    NunchukInputConfigDialog dlg(this, m_config, _("Nunchuk Configuration"), device_cbox,
+                                 m_port_num);
     dlg.ShowModal();
   }
   break;
   case WiimoteEmu::EXT_CLASSIC:
   {
-    ClassicInputConfigDialog dlg(this, m_config, _("Classic Controller Configuration"), m_port_num);
+    ClassicInputConfigDialog dlg(this, m_config, _("Classic Controller Configuration"), device_cbox,
+                                 m_port_num);
     dlg.ShowModal();
   }
   break;
   case WiimoteEmu::EXT_GUITAR:
   {
-    GuitarInputConfigDialog dlg(this, m_config, _("Guitar Configuration"), m_port_num);
+    GuitarInputConfigDialog dlg(this, m_config, _("Guitar Configuration"), device_cbox, m_port_num);
     dlg.ShowModal();
   }
   break;
   case WiimoteEmu::EXT_DRUMS:
   {
-    DrumsInputConfigDialog dlg(this, m_config, _("Drums Configuration"), m_port_num);
+    DrumsInputConfigDialog dlg(this, m_config, _("Drums Configuration"), device_cbox, m_port_num);
     dlg.ShowModal();
   }
   break;
   case WiimoteEmu::EXT_TURNTABLE:
   {
-    TurntableInputConfigDialog dlg(this, m_config, _("Turntable Configuration"), m_port_num);
+    TurntableInputConfigDialog dlg(this, m_config, _("Turntable Configuration"), device_cbox,
+                                   m_port_num);
     dlg.ShowModal();
   }
   break;

diff --git a/Source/Core/DolphinWX/Input/NunchukInputConfigDiag.cpp b/Source/Core/DolphinWX/Input/NunchukInputConfigDiag.cpp
@@ -8,11 +8,15 @@
 #include "Core/HW/WiimoteEmu/WiimoteEmu.h"
 
 NunchukInputConfigDialog::NunchukInputConfigDialog(wxWindow* const parent, InputConfig& config,
-                                                   const wxString& name, const int port_num)
+                                                   const wxString& name,
+                                                   wxComboBox* device_cbox_parent,
+                                                   const int port_num)
     : InputConfigDialog(parent, config, name, port_num)
 {
   const int space5 = FromDIP(5);
 
+  device_cbox = device_cbox_parent;
+
   auto* const group_box_buttons = new ControlGroupBox(
       Wiimote::GetNunchukGroup(port_num, WiimoteEmu::NunchukGroup::Buttons), this, this);
   auto* const group_box_shake = new ControlGroupBox(

diff --git a/Source/Core/DolphinWX/Input/NunchukInputConfigDiag.h b/Source/Core/DolphinWX/Input/NunchukInputConfigDiag.h
@@ -6,9 +6,11 @@
 
 #include "DolphinWX/Input/InputConfigDiag.h"
 
+class wxComboBox;
+
 class NunchukInputConfigDialog final : public InputConfigDialog
 {
 public:
   NunchukInputConfigDialog(wxWindow* parent, InputConfig& config, const wxString& name,
-                           int port_num = 0);
+                           wxComboBox* device_cbox_parent, int port_num = 0);
 };
diff --git a/Source/Core/DolphinWX/Input/TurntableInputConfigDiag.cpp b/Source/Core/DolphinWX/Input/TurntableInputConfigDiag.cpp
@@ -8,11 +8,15 @@
 #include "Core/HW/WiimoteEmu/WiimoteEmu.h"
 
 TurntableInputConfigDialog::TurntableInputConfigDialog(wxWindow* const parent, InputConfig& config,
-                                                       const wxString& name, const int port_num)
+                                                       const wxString& name,
+                                                       wxComboBox* device_cbox_parent,
+                                                       const int port_num)
     : InputConfigDialog(parent, config, name, port_num)
 {
   const int space5 = FromDIP(5);
 
+  device_cbox = device_cbox_parent;
+
   auto* const group_box_stick = new ControlGroupBox(
       Wiimote::GetTurntableGroup(port_num, WiimoteEmu::TurntableGroup::Stick), this, this);
   auto* const group_box_effect_dial = new ControlGroupBox(

diff --git a/Source/Core/DolphinWX/Input/TurntableInputConfigDiag.h b/Source/Core/DolphinWX/Input/TurntableInputConfigDiag.h
@@ -6,9 +6,11 @@
 
 #include "DolphinWX/Input/InputConfigDiag.h"
 
+class wxComboBox;
+
 class TurntableInputConfigDialog final : public InputConfigDialog
 {
 public:
   TurntableInputConfigDialog(wxWindow* parent, InputConfig& config, const wxString& name,
-                             int port_num = 0);
+                             wxComboBox* device_cbox_parent, int port_num = 0);
 };