summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/Input/InputConfigDiag.cpp
diff options
context:
space:
mode:
authorAnthony <Helios747@users.noreply.github.com>2017-02-09 21:50:44 -0800
committerGitHub <noreply@github.com>2017-02-09 21:50:44 -0800
commit96e83b5d54a13fd768552d74aeaf95c0a999665f (patch)
treeeb7d0c6e5640a9692b5a1c5b8ad87b108c978ad8 /Source/Core/DolphinWX/Input/InputConfigDiag.cpp
parent3cbbd48da9f907b98a199f12a9d3905e36eefe6c (diff)
parent334e33d4fa65b0efc25b7b250f0cf4f9e8891bda (diff)
Merge pull request #4764 from aldelaro5/crash-fix-inputconfig
InputConfigDialog pass the device_cbox to the wiimote extension dialogs
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 af218ff470..c0f5496fe4 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;