[macos] Kill autofill process not closed by macOS

Author: drhelius

platforms/macos/Makefile

@@ -1,7 +1,7 @@
 include ../shared/makefiles/Makefile.sources
 
 SOURCES_MM += $(DEPS_DIR)/nfd/nfd_cocoa.mm
-SOURCES_MM += fullscreen.mm
+SOURCES_MM += macos.mm
 OBJECTS += $(SOURCES_MM:.mm=.o)
 LDFLAGS += -framework AppKit -framework UniformTypeIdentifiers
 

platforms/macos/fullscreen.mm platforms/macos/macos.mmplatforms/macos/fullscreen.mm renamed to platforms/macos/macos.mm

@@ -88,3 +88,20 @@ - (void)dealloc
         [win toggleFullScreen:nil];
     }
 }
+
+// Workaround for macOS Tahoe bug: AutoFill helper processes are not terminated on app exit
+extern "C" void macos_kill_autofill_helpers(const char* app_name)
+{
+    @autoreleasepool {
+        NSString* appNameLower = [[NSString stringWithUTF8String:app_name] lowercaseString];
+
+        for (NSRunningApplication *app in [[NSWorkspace sharedWorkspace] runningApplications]) {
+            if ([app.bundleIdentifier isEqualToString:@"com.apple.SafariPlatformSupport.Helper"]) {
+                NSString* localizedNameLower = [[app localizedName] lowercaseString];
+                if ([localizedNameLower hasPrefix:@"autofill"] && [localizedNameLower containsString:appNameLower]) {
+                    [app forceTerminate];
+                }
+            }
+        }
+    }
+}

platforms/shared/desktop/application.cpp

@@ -97,6 +97,7 @@ static void* macos_fullscreen_observer = NULL;
 static void* macos_nswindow = NULL;
 extern "C" void* macos_install_fullscreen_observer(void* nswindow, void(*enter_cb)(), void(*exit_cb)());
 extern "C" void macos_set_native_fullscreen(void* nswindow, bool enter);
+extern "C" void macos_kill_autofill_helpers(const char* app_name);
 #endif
 
 int application_init(const char* rom_file, const char* symbol_file, bool force_fullscreen, bool force_windowed, int mcp_mode, int mcp_tcp_port)
@@ -187,6 +188,10 @@ void application_destroy(void)
     gui_destroy();
     sdl_destroy();
     single_instance_destroy();
+
+#if defined(__APPLE__)
+    macos_kill_autofill_helpers(GG_TITLE);
+#endif
 }
 
 void application_mainloop(void)