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/TurntableInputConfigDiag.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Source/Core/DolphinWX/Input/TurntableInputConfigDiag.cpp') 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( -- cgit v1.2.3