apple: better mfi controller disconnect handling

warmenhoven · warmenhoven · commit eea37466fc54 · 2025-06-27T11:17:33.000-04:00
diff --git a/input/drivers_joypad/mfi_joypad.m b/input/drivers_joypad/mfi_joypad.m
@@ -403,11 +403,13 @@ - (void)shutdown
 {
     if (@available(iOS 14, tvOS 14, macOS 11, *))
     {
-        if (_weakPlayer) [_weakPlayer stopAtTime:0 error:nil];
+        for (CHHapticEngine *eng in self.engines)
+            eng.resetHandler = ^{};
+        [self.engines removeAllObjects];
+        if (_weakPlayer) [_weakPlayer cancelAndReturnError:nil];
         _weakPlayer   = nil;
-        if (_strongPlayer) [_strongPlayer stopAtTime:0 error:nil];
+        if (_strongPlayer) [_strongPlayer cancelAndReturnError:nil];
         _strongPlayer = nil;
-        [self.engines removeAllObjects];
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -403,11 +403,13 @@ - (void)shutdown`
`403`	`403`	`{`
`404`	`404`	`if (@available(iOS 14, tvOS 14, macOS 11, *))`
`405`	`405`	`{`
`406`		`- if (_weakPlayer) [_weakPlayer stopAtTime:0 error:nil];`
	`406`	`+ for (CHHapticEngine *eng in self.engines)`
	`407`	`+ eng.resetHandler = ^{};`
	`408`	`+ [self.engines removeAllObjects];`
	`409`	`+ if (_weakPlayer) [_weakPlayer cancelAndReturnError:nil];`
`407`	`410`	`_weakPlayer = nil;`
`408`		`- if (_strongPlayer) [_strongPlayer stopAtTime:0 error:nil];`
	`411`	`+ if (_strongPlayer) [_strongPlayer cancelAndReturnError:nil];`
`409`	`412`	`_strongPlayer = nil;`
`410`		`- [self.engines removeAllObjects];`
`411`	`413`	`}`
`412`	`414`	`}`
`413`	`415`