Merge pull request #95425 from bruvzg/macos_joypad_queue

[macOS] Fix wrong object type in joypad queue.
godotengine · Aug 12, 2024 · edc0571 · edc0571
2 parents 47d0bdd + d1047f4
commit edc0571
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/platform/macos/joypad_macos.mm b/platform/macos/joypad_macos.mm
@@ -228,7 +228,7 @@ @interface JoypadMacOSObserver ()
 @property(assign, nonatomic) BOOL isObserving;
 @property(assign, nonatomic) BOOL isProcessing;
 @property(strong, nonatomic) NSMutableDictionary<NSNumber *, Joypad *> *connectedJoypads;
-@property(strong, nonatomic) NSMutableArray<Joypad *> *joypadsQueue;
+@property(strong, nonatomic) NSMutableArray<GCController *> *joypadsQueue;
 
 @end
 
@@ -364,8 +364,7 @@ - (void)controllerWasConnected:(NSNotification *)notification {
 	if ([[self getAllKeysForController:controller] count] > 0) {
 		print_verbose("Controller is already registered.");
 	} else if (!self.isProcessing) {
-		Joypad *joypad = [[Joypad alloc] init:controller];
-		[self.joypadsQueue addObject:joypad];
+		[self.joypadsQueue addObject:controller];
 	} else {
 		[self addMacOSJoypad:controller];
 	}