diff options
| author | Anthony <Helios747@users.noreply.github.com> | 2016-11-30 20:47:38 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-30 20:47:38 -0600 |
| commit | a95e3c875e2749b4a489aa988f5b35608f5a8b59 (patch) | |
| tree | 5239317db159c4fc5ab7272e3ac866d1487fca54 /Source/Core/InputCommon/ControllerInterface/Xlib | |
| parent | e2018f22085dd168b8ef6ec1c8ff6260e8c3e8b2 (diff) | |
| parent | 3e69d066f5e9ad0a1097d806c656035398bbb7bc (diff) | |
Merge pull request #4343 from ligfx/fixsdlcrash
ControllerInterface: Fix crashes when using SDL controllers
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/Xlib')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp index de3490f2e0..29ac62f32c 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp @@ -46,7 +46,7 @@ namespace ciface namespace XInput2 { // This function will add zero or more KeyboardMouse objects to devices. -void Init(void* const hwnd) +void PopulateDevices(void* const hwnd) { Display* dpy = XOpenDisplay(nullptr); diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h index 80df03db70..5c5124cb3b 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h @@ -18,7 +18,7 @@ namespace ciface { namespace XInput2 { -void Init(void* const hwnd); +void PopulateDevices(void* const hwnd); class KeyboardMouse : public Core::Device { |