Commit 14db417e122d9a8d842f851234b30030ba28ef22

Sam Lantinga 2022-03-08T21:32:27

Reenable getting the serial number on macOS We filter now on game controllers, so we shouldn't hit the crash bug on random devices that this was working around.

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
diff --git a/src/hidapi/mac/hid.c b/src/hidapi/mac/hid.c
index 6e70285..716c7de 100644
--- a/src/hidapi/mac/hid.c
+++ b/src/hidapi/mac/hid.c
@@ -326,10 +326,7 @@ static int get_string_property_utf8(IOHIDDeviceRef device, CFStringRef prop, cha
 
 static int get_serial_number(IOHIDDeviceRef device, wchar_t *buf, size_t len)
 {
-	// This crashes on M1 Macs, tracked by radar bug 79667729
-	//return get_string_property(device, CFSTR(kIOHIDSerialNumberKey), buf, len);
-	buf[0] = 0;
-	return 0;
+	return get_string_property(device, CFSTR(kIOHIDSerialNumberKey), buf, len);
 }
 
 static int get_manufacturer_string(IOHIDDeviceRef device, wchar_t *buf, size_t len)