From 93fd4a1c802298b6c7f20e80bbb2c93fd1cb8bb7 Mon Sep 17 00:00:00 2001 From: Sora <37141176+sorascode@users.noreply.github.com> Date: Mon, 15 Sep 2025 12:58:05 +0200 Subject: [PATCH] fix: use productCategory instead of vendorName for joy name for apple driver (cherry picked from commit 964bedfdd906673944ea5fce52c2e748a62f4994) --- src/joystick/apple/SDL_mfijoystick.m | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/joystick/apple/SDL_mfijoystick.m b/src/joystick/apple/SDL_mfijoystick.m index 811a9f1ae7..48e9051798 100644 --- a/src/joystick/apple/SDL_mfijoystick.m +++ b/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. */ 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) {