Ver Fonte

fix: use productCategory instead of vendorName for joy name for apple driver

(cherry picked from commit 964bedfdd906673944ea5fce52c2e748a62f4994)
Sora há 5 meses atrás
pai
commit
93fd4a1c80
1 ficheiros alterados com 8 adições e 2 exclusões
  1. 8 2
      src/joystick/apple/SDL_mfijoystick.m

+ 8 - 2
src/joystick/apple/SDL_mfijoystick.m

@@ -300,8 +300,14 @@ static bool IOS_AddMFIJoystickDevice(SDL_JoystickDeviceItem *device, GCControlle
      * struct, and ARC doesn't work with structs. */
      * struct, and ARC doesn't work with structs. */
     device->controller = (__bridge GCController *)CFBridgingRetain(controller);
     device->controller = (__bridge GCController *)CFBridgingRetain(controller);
 
 
-    if (controller.vendorName) {
-        name = controller.vendorName.UTF8String;
+    if (@available(macOS 10.15, iOS 13.0, tvOS 13.0, *)) {
+        if (controller.productCategory) {
+            name = controller.productCategory.UTF8String;
+        }
+    } else {
+        if (controller.vendorName) {
+            name = controller.vendorName.UTF8String;
+        }
     }
     }
 
 
     if (!name) {
     if (!name) {