diff options
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/OSX')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm index 900fc29a70..948e2b85fa 100644 --- a/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm +++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm @@ -173,13 +173,21 @@ static void DeviceMatchingCallback(void* inContext, IOReturn inResult, void* inS // Add a device if it's of a type we want if (IOHIDDeviceConformsTo(inIOHIDDeviceRef, kHIDPage_GenericDesktop, kHIDUsage_GD_Keyboard)) - g_controller_interface.AddDevice(std::make_shared<Keyboard>(inIOHIDDeviceRef, name, g_window)); + { + if (g_window) + g_controller_interface.AddDevice( + std::make_shared<Keyboard>(inIOHIDDeviceRef, name, g_window)); + } #if 0 else if (IOHIDDeviceConformsTo(inIOHIDDeviceRef, kHIDPage_GenericDesktop, kHIDUsage_GD_Mouse)) + { g_controller_interface.AddDevice(new Mouse(inIOHIDDeviceRef, name)); + } #endif else + { g_controller_interface.AddDevice(std::make_shared<Joystick>(inIOHIDDeviceRef, name)); + } NOTICE_LOG(SERIALINTERFACE, "Added device: %s", name.c_str()); g_controller_interface.InvokeHotplugCallbacks(); @@ -187,12 +195,12 @@ static void DeviceMatchingCallback(void* inContext, IOReturn inResult, void* inS void Init(void* window) { + g_window = window; + HIDManager = IOHIDManagerCreate(kCFAllocatorDefault, kIOHIDOptionsTypeNone); if (!HIDManager) ERROR_LOG(SERIALINTERFACE, "Failed to create HID Manager reference"); - g_window = window; - IOHIDManagerSetDeviceMatching(HIDManager, nullptr); if (IOHIDManagerOpen(HIDManager, kIOHIDOptionsTypeNone) != kIOReturnSuccess) ERROR_LOG(SERIALINTERFACE, "Failed to open HID Manager"); |