summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/Input/InputConfigDiag.cpp
diff options
context:
space:
mode:
authoraldelaro5 <aldelaro5@gmail.com>2017-01-27 00:05:09 -0500
committeraldelaro5 <aldelaro5@gmail.com>2017-01-27 01:06:38 -0500
commit334e33d4fa65b0efc25b7b250f0cf4f9e8891bda (patch)
tree19b024cc8a348e3a42bbeb910cfecb330bea0265 /Source/Core/DolphinWX/Input/InputConfigDiag.cpp
parent540bf4618c3bf6a910e533ecc7b5e782c1e9e70a (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/InputConfigDiag.cpp')
-rw-r--r--Source/Core/DolphinWX/Input/InputConfigDiag.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/Source/Core/DolphinWX/Input/InputConfigDiag.cpp b/Source/Core/DolphinWX/Input/InputConfigDiag.cpp
index ed71fd1b3f..9170eca3da 100644
--- 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;