diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2016-01-30 13:17:08 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2016-01-30 13:17:08 +0100 |
| commit | c2c1f839dd3302249db9dbc04e64f320fa4586d0 (patch) | |
| tree | c36d0bb67d06052b1058d38327a7d68c0da433c5 /Source | |
| parent | 50221088a98d59133c28a24ad89cc1b93989cfcc (diff) | |
| parent | ea44e0e3ba51737c4736125f67cb90ae4f59e045 (diff) | |
Merge pull request #3574 from palxex/master
fix El Capitan WiimoteReal pairing problem and refresh crash problem
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/Core/HW/WiimoteReal/IOdarwin.mm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Core/Core/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/HW/WiimoteReal/IOdarwin.mm index 4c5787f250..e6a518643e 100644 --- a/Source/Core/Core/HW/WiimoteReal/IOdarwin.mm +++ b/Source/Core/Core/HW/WiimoteReal/IOdarwin.mm @@ -169,7 +169,8 @@ void WiimoteScanner::FindWiimotes(std::vector<Wiimote*> & found_wiimotes, Wiimot @{ @kIOHIDVendorIDKey: @0x057e, @kIOHIDProductIDKey: @0x0330 }, ]; IOHIDManagerSetDeviceMatchingMultiple(hid, (CFArrayRef)criteria); - CFRunLoopRun(); + if (IOHIDManagerOpen(hid, kIOHIDOptionsTypeNone) != kIOReturnSuccess) + WARN_LOG(WIIMOTE, "Failed to open HID Manager"); CFSetRef devices = IOHIDManagerCopyDevices(hid); if (devices) { |