diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2016-06-26 04:03:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-26 04:03:33 +0200 |
| commit | c1fa1e67497ed38623f63d1457e1992e56287833 (patch) | |
| tree | ab08f49876092b20db0d05faabfa769c76fb2abc /Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp | |
| parent | e31a4d1f0731603d0396e592e23cf7acd0457397 (diff) | |
| parent | 8678133e8746fdc20f7d012005ebf2db370ddccc (diff) | |
Merge pull request #3923 from leoetlino/ciface-small-cleanup
ControllerInterface: Small cleanup
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp index d46f1cf4f6..c7c2e74242 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp @@ -76,10 +76,12 @@ void Init(void* const hwnd) { current_master = &all_masters[i]; if (current_master->use == XIMasterPointer) + { // Since current_master is a master pointer, its attachment must // be a master keyboard. - g_controller_interface.AddDevice(new KeyboardMouse( + g_controller_interface.AddDevice(std::make_shared<KeyboardMouse>( (Window)hwnd, xi_opcode, current_master->deviceid, current_master->attachment)); + } } XCloseDisplay(dpy); |
