summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/Input/ClassicInputConfigDiag.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/ClassicInputConfigDiag.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/ClassicInputConfigDiag.cpp')
-rw-r--r--Source/Core/DolphinWX/Input/ClassicInputConfigDiag.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/Core/DolphinWX/Input/ClassicInputConfigDiag.cpp b/Source/Core/DolphinWX/Input/ClassicInputConfigDiag.cpp
index 205bd83952..f3a6bfb0fa 100644
--- a/Source/Core/DolphinWX/Input/ClassicInputConfigDiag.cpp
+++ b/Source/Core/DolphinWX/Input/ClassicInputConfigDiag.cpp
@@ -8,11 +8,15 @@
#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
ClassicInputConfigDialog::ClassicInputConfigDialog(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_buttons = new ControlGroupBox(
Wiimote::GetClassicGroup(port_num, WiimoteEmu::ClassicGroup::Buttons), this, this);
auto* const group_box_dpad = new ControlGroupBox(