apple: mfi: attempted controller disconnect fix

warmenhoven · warmenhoven · commit a0075bd9bca2 · 2026-01-13T14:44:54.000-05:00
diff --git a/input/drivers_joypad/mfi_joypad.m b/input/drivers_joypad/mfi_joypad.m
@@ -460,9 +460,9 @@ - (void)shutdown
 {
     if (@available(iOS 14, tvOS 14, macOS 11, *))
     {
-        if (_weakPlayer) [_weakPlayer cancelAndReturnError:nil];
-        if (_strongPlayer) [_strongPlayer cancelAndReturnError:nil];
-
+        /* When controller disconnects, the haptic engine is already stopped
+         * by the system, so don't bother trying to cancel players - just
+         * clear the handlers and release everything. */
         for (CHHapticEngine *eng in self.engines)
         {
             eng.stoppedHandler = ^(CHHapticEngineStoppedReason reason) {};

Original file line number	Diff line number	Diff line change
`@@ -460,9 +460,9 @@ - (void)shutdown`
`460`	`460`	`{`
`461`	`461`	`if (@available(iOS 14, tvOS 14, macOS 11, *))`
`462`	`462`	`{`
`463`		`- if (_weakPlayer) [_weakPlayer cancelAndReturnError:nil];`
`464`		`- if (_strongPlayer) [_strongPlayer cancelAndReturnError:nil];`
`465`		`-`
	`463`	`+ /* When controller disconnects, the haptic engine is already stopped`
	`464`	`+ * by the system, so don't bother trying to cancel players - just`
	`465`	`+ * clear the handlers and release everything. */`
`466`	`466`	`for (CHHapticEngine *eng in self.engines)`
`467`	`467`	`{`
`468`	`468`	`eng.stoppedHandler = ^(CHHapticEngineStoppedReason reason) {};`