Merge pull request dolphin-emu#3574 from palxex/master

fix El Capitan WiimoteReal pairing problem and refresh crash problem
jezze · Jan 30, 2016 · c2c1f83 · c2c1f83
2 parents 5022108 + ea44e0e
commit c2c1f83
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Source/Core/Core/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/HW/WiimoteReal/IOdarwin.mm
@@ -169,7 +169,8 @@ @interface ConnectBT: NSObject {}
 			@{ @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)
 		{