kc3-lang/SDL

2023-04-24T18:47:04

hidapi/mac: import mainstream commit c1b9d2ad https://github.com/libusb/hidapi/commit/c1b9d2ad985c826f7916aa793d4728885a43a0f4 Properly handle the close of run loop on macOS (https://github.com/libusb/hidapi/pull/522) - as per documentation `kCFRunLoopRunStopped` should be handled once the runloop is closed via `CFRunLoopStop`; - if it is not handled - a race condition/crash may happen on the latest macOS when a device gets disconnected while being open; (cherry picked from commit 62d1a2c836c6176a6c76d54229eafa7d011bb9fb)

diff --git a/src/hidapi/mac/hid.c b/src/hidapi/mac/hid.c
index 372a967..e8c0d09 100644
--- a/src/hidapi/mac/hid.c
+++ b/src/hidapi/mac/hid.c
@@ -772,7 +772,7 @@ static void *read_thread(void *param)
 	while (!dev->shutdown_thread && !dev->disconnected) {
 		code = CFRunLoopRunInMode(dev->run_loop_mode, 1000/*sec*/, FALSE);
 		/* Return if the device has been disconnected */
-		if (code == kCFRunLoopRunFinished) {
+		if (code == kCFRunLoopRunFinished || code == kCFRunLoopRunStopped) {
 			dev->disconnected = 1;
 			break;
 		}