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/OSX | |
| 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/OSX')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/OSX/OSX.h | 1 | ||||
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSX.h b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.h index c2104774b7..ac1db3e89a 100644 --- a/Source/Core/InputCommon/ControllerInterface/OSX/OSX.h +++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.h @@ -9,6 +9,7 @@ namespace ciface namespace OSX { void Init(void* window); +void PopulateDevices(void* window); void DeInit(); void DeviceElementDebugPrint(const void*, void*); diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm index e575260a89..9aeeec59fb 100644 --- a/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm +++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm @@ -182,6 +182,12 @@ void Init(void* window) IOHIDManagerUnscheduleFromRunLoop(HIDManager, CFRunLoopGetCurrent(), OurRunLoop); } +void PopulateDevices(void* window) +{ + DeInit(); + Init(window); +} + void DeInit() { // This closes all devices as well |