From abaaa87a4728d497ed31a7faefd6d52d127c0dda Mon Sep 17 00:00:00 2001 From: sora Date: Tue, 1 Apr 2025 21:12:55 +0200 Subject: [PATCH] fix: use productCategory instead of vendorName for joy name on macos --- drivers/apple/joypad_apple.mm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/apple/joypad_apple.mm b/drivers/apple/joypad_apple.mm index e7d08d7cf95..fced2f31dcb 100644 --- a/drivers/apple/joypad_apple.mm +++ b/drivers/apple/joypad_apple.mm @@ -503,7 +503,13 @@ void JoypadApple::add_joypad(GCController *p_controller) { } // Tell Godot about our new controller. - Input::get_singleton()->joy_connection_changed(joy_id, true, String::utf8(p_controller.vendorName.UTF8String)); + char const *device_name; + if (@available(macOS 10.15, iOS 13.0, tvOS 13.0, *)) { + device_name = p_controller.productCategory.UTF8String; + } else { + device_name = p_controller.vendorName.UTF8String; + } + Input::get_singleton()->joy_connection_changed(joy_id, true, String::utf8(device_name)); // Assign our player index. joypads.insert(joy_id, memnew(GameController(joy_id, p_controller)));