From ef0ae4c90326ddcba2dfd84ac0690ceb2f2b02ed Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Wed, 19 Nov 2025 11:35:38 -0800
Subject: [PATCH] Revert "fix: use productCategory instead of vendorName for
joy name for apple driver"
This reverts commit 964bedfdd906673944ea5fce52c2e748a62f4994.
The vendorName is more expressive and lets the user distinguish between different controllers of the same type, e.g. "PlayStation VR2 Sense Controller (R)" and "PlayStation VR2 Sense Controller (L)" vs "Spatial Controller"
If the product category is necessary, we can add a property to store that as additional information on the controller.
---
src/joystick/apple/SDL_mfijoystick.m | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/joystick/apple/SDL_mfijoystick.m b/src/joystick/apple/SDL_mfijoystick.m
index 1183a0347537c..543016a4f4818 100644
--- a/src/joystick/apple/SDL_mfijoystick.m
+++ b/src/joystick/apple/SDL_mfijoystick.m
@@ -304,14 +304,8 @@ static bool IOS_AddMFIJoystickDevice(SDL_JoystickDeviceItem *device, GCControlle
* struct, and ARC doesn't work with structs. */
device->controller = (__bridge GCController *)CFBridgingRetain(controller);
- 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 (controller.vendorName) {
+ name = controller.vendorName.UTF8String;
}
if (!name) {