From 334e33d4fa65b0efc25b7b250f0cf4f9e8891bda Mon Sep 17 00:00:00 2001 From: aldelaro5 Date: Fri, 27 Jan 2017 00:05:09 -0500 Subject: 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. --- Source/Core/DolphinWX/Input/InputConfigDiag.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'Source/Core/DolphinWX/Input/InputConfigDiag.cpp') 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; -- cgit v1.2.3