diff options
| author | aldelaro5 <aldelaro5@gmail.com> | 2017-01-27 00:05:09 -0500 |
|---|---|---|
| committer | aldelaro5 <aldelaro5@gmail.com> | 2017-01-27 01:06:38 -0500 |
| commit | 334e33d4fa65b0efc25b7b250f0cf4f9e8891bda (patch) | |
| tree | 19b024cc8a348e3a42bbeb910cfecb330bea0265 /Source/Core/DolphinWX/Input/TurntableInputConfigDiag.cpp | |
| parent | 540bf4618c3bf6a910e533ecc7b5e782c1e9e70a (diff) | |
InputConfigDialog pass the device_cbox to the wiimote extension dialogs
This fixes a crash when trying to open the advanced input config dialog on the wiimote extensions. The device_cbox wasn't initialised and it should have been with the wiimote one.
Diffstat (limited to 'Source/Core/DolphinWX/Input/TurntableInputConfigDiag.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Input/TurntableInputConfigDiag.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/Core/DolphinWX/Input/TurntableInputConfigDiag.cpp b/Source/Core/DolphinWX/Input/TurntableInputConfigDiag.cpp index bc5b627d6c..6f2728525d 100644 --- 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( |
