apple: safer cleanup of haptic engines

Author: warmenhoven

input/drivers/cocoa_input.m

@@ -742,6 +742,23 @@ static void cocoa_input_free(void *data)
    if (!apple || !data)
       return;
 
+#if TARGET_OS_IOS
+   if (@available(iOS 14, *))
+   {
+      if (keypressHapticEngine)
+      {
+         keypressHapticEngine.stoppedHandler = ^(CHHapticEngineStoppedReason reason) {};
+         keypressHapticEngine.resetHandler = ^{};
+         [keypressHapticEngine stopWithCompletionHandler:^(NSError *error) {
+            keypressHapticPlayer = nil;
+            keypressHapticEngine = nil;
+         }];
+      }
+   }
+   else if (@available(iOS 10, *))
+      feedbackGenerator = nil;
+#endif
+
    memset(apple_key_state, 0, sizeof(apple_key_state));
 
    free(apple);
@@ -889,8 +906,8 @@ static void cocoa_input_init_haptic_engine(void) KEYPRESS_HAPTIC_AVAIL
          if (!error)
          {
             keypressHapticEngine.stoppedHandler = ^(CHHapticEngineStoppedReason reason) {
+               /* Engine stopped (backgrounding/interruption) - clear player but keep engine */
                keypressHapticPlayer = nil;
-               keypressHapticEngine = nil;
             };
             keypressHapticEngine.resetHandler = ^{
                if (keypressHapticEngine)
@@ -913,7 +930,18 @@ static void cocoa_input_keypress_vibrate(void)
       if (!settings || !keypressHapticEngine)
          return;
 
+      /* Ensure engine is started (may have been stopped by backgrounding) */
       NSError *error;
+      [keypressHapticEngine startAndReturnError:&error];
+      if (error)
+      {
+         /* Engine couldn't start - recreate it */
+         keypressHapticEngine = nil;
+         keypressHapticPlayer = nil;
+         cocoa_input_init_haptic_engine();
+         if (!keypressHapticEngine)
+            return;
+      }
       unsigned rumble_gain = settings->uints.input_rumble_gain;
       float intensity = (float)rumble_gain / 100.0f;
 
@@ -950,14 +978,18 @@ static void cocoa_input_keypress_vibrate(void)
       else
       {
          /* Update intensity for existing player */
-         CHHapticDynamicParameter *param = [[CHHapticDynamicParameter alloc]
-            initWithParameterID:CHHapticDynamicParameterIDHapticIntensityControl
-                          value:intensity
-                   relativeTime:0];
-         [keypressHapticPlayer sendParameters:[NSArray arrayWithObject:param] atTime:0 error:&error];
+         if (keypressHapticPlayer)
+         {
+            CHHapticDynamicParameter *param = [[CHHapticDynamicParameter alloc]
+               initWithParameterID:CHHapticDynamicParameterIDHapticIntensityControl
+                             value:intensity
+                      relativeTime:0];
+            [keypressHapticPlayer sendParameters:[NSArray arrayWithObject:param] atTime:0 error:&error];
+         }
       }
 
-      [keypressHapticPlayer startAtTime:0 error:&error];
+      if (keypressHapticPlayer)
+         [keypressHapticPlayer startAtTime:0 error:&error];
    }
    else
    {

input/drivers_joypad/mfi_joypad.m

@@ -359,6 +359,15 @@ - (instancetype)initWithController:(GCController*)controller MFI_RUMBLE_AVAIL
     [self.engines addObject:engine];
 
     __weak MFIRumbleController *weakSelf = self;
+    engine.stoppedHandler = ^(CHHapticEngineStoppedReason reason) {
+        MFIRumbleController *strongSelf = weakSelf;
+        if (!strongSelf)
+            return;
+
+        /* Engine stopped (backgrounding/interruption) - clear players but keep engine in set */
+        strongSelf->_strongPlayer = nil;
+        strongSelf->_weakPlayer = nil;
+    };
     engine.resetHandler = ^{
         MFIRumbleController *strongSelf = weakSelf;
         if (!strongSelf)
@@ -416,12 +425,18 @@ - (void)shutdown
 {
     if (@available(iOS 14, tvOS 14, macOS 11, *))
     {
+        if (_weakPlayer) [_weakPlayer cancelAndReturnError:nil];
+        if (_strongPlayer) [_strongPlayer cancelAndReturnError:nil];
+
         for (CHHapticEngine *eng in self.engines)
+        {
+            eng.stoppedHandler = ^(CHHapticEngineStoppedReason reason) {};
             eng.resetHandler = ^{};
+            [eng stopWithCompletionHandler:nil];
+        }
         [self.engines removeAllObjects];
-        if (_weakPlayer) [_weakPlayer cancelAndReturnError:nil];
-        _weakPlayer   = nil;
-        if (_strongPlayer) [_strongPlayer cancelAndReturnError:nil];
+
+        _weakPlayer = nil;
         _strongPlayer = nil;
     }
 }
@@ -553,9 +568,9 @@ static void apple_gamecontroller_device_haptics_setup(void) IPHONE_RUMBLE_AVAIL
 
     deviceHapticEngine.stoppedHandler = ^(CHHapticEngineStoppedReason reason)
     {
+        /* Engine stopped (backgrounding/interruption) - clear players but keep engine */
         deviceWeakPlayer = nil;
         deviceStrongPlayer = nil;
-        deviceHapticEngine = nil;
     };
     deviceHapticEngine.resetHandler = ^{
         if (!deviceHapticEngine)
@@ -573,10 +588,23 @@ static void apple_gamecontroller_device_haptics_setup(void) IPHONE_RUMBLE_AVAIL
     if (!deviceHapticEngine)
         return nil;
 
+    /* Ensure engine is started (may have been stopped by backgrounding) */
+    NSError *error;
+    [deviceHapticEngine startAndReturnError:&error];
+    if (error)
+    {
+        /* Engine couldn't start - recreate it */
+        deviceHapticEngine = nil;
+        deviceWeakPlayer = nil;
+        deviceStrongPlayer = nil;
+        apple_gamecontroller_device_haptics_setup();
+        if (!deviceHapticEngine)
+            return nil;
+    }
+
     CHHapticEventParameter *intense;
     CHHapticEvent *event;
     CHHapticPattern *pattern;
-    NSError *error;
 
     CHHapticEventParameter *sharp;
 
@@ -654,7 +682,24 @@ static void apple_gamecontroller_device_haptics_setup(void) IPHONE_RUMBLE_AVAIL
    return (void*)-1;
 }
 
-static void apple_gamecontroller_joypad_destroy(void) { }
+static void apple_gamecontroller_joypad_destroy(void)
+{
+#if TARGET_OS_IOS
+   if (@available(iOS 14, *))
+   {
+      if (deviceHapticEngine)
+      {
+         deviceHapticEngine.stoppedHandler = ^(CHHapticEngineStoppedReason reason) {};
+         deviceHapticEngine.resetHandler = ^{};
+         [deviceHapticEngine stopWithCompletionHandler:^(NSError *error) {
+            deviceWeakPlayer = nil;
+            deviceStrongPlayer = nil;
+            deviceHapticEngine = nil;
+         }];
+      }
+   }
+#endif
+}
 
 static int32_t apple_gamecontroller_joypad_button(
       unsigned port, uint16_t joykey)