瀏覽代碼

Merge pull request #95425 from bruvzg/macos_joypad_queue

[macOS] Fix wrong object type in joypad queue.
Rémi Verschelde 1 年之前
父節點
當前提交
edc0571c96
共有 1 個文件被更改,包括 2 次插入3 次删除
  1. 2 3
      platform/macos/joypad_macos.mm

+ 2 - 3
platform/macos/joypad_macos.mm

@@ -228,7 +228,7 @@ void JoypadMacOS::joypad_vibration_stop(Joypad *p_joypad, uint64_t p_timestamp)
 @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 JoypadMacOS::joypad_vibration_stop(Joypad *p_joypad, uint64_t p_timestamp)
 	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];
 	}