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/Quartz | |
| 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/Quartz')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.h | 2 | ||||
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.mm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.h b/Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.h index 3e08410f6b..03f6ca9993 100644 --- a/Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.h +++ b/Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.h @@ -8,7 +8,7 @@ namespace ciface { namespace Quartz { -void Init(void* window); +void PopulateDevices(void* window); void DeInit(); } } diff --git a/Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.mm b/Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.mm index 6fdac0e798..a090b421a5 100644 --- a/Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.mm +++ b/Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.mm @@ -10,7 +10,7 @@ namespace ciface { namespace Quartz { -void Init(void* window) +void PopulateDevices(void* window) { g_controller_interface.AddDevice(std::make_shared<KeyboardAndMouse>(window)); } |