From e16deecd6a2ee1b521e5528afa0257fa28cfa903 Mon Sep 17 00:00:00 2001
From: Julien Lebosquain <julien@lebosquain.net>
Date: Wed, 19 Jul 2023 12:05:49 +0200
Subject: [PATCH] Use ProcessExit to cleanup the native resources

---
 native/Avalonia.Native/src/OSX/main.mm        | 3 ++-
 src/Avalonia.Native/AvaloniaNativePlatform.cs | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/native/Avalonia.Native/src/OSX/main.mm b/native/Avalonia.Native/src/OSX/main.mm
index 37fd0758e5..3fddb72529 100644
--- a/native/Avalonia.Native/src/OSX/main.mm
+++ b/native/Avalonia.Native/src/OSX/main.mm
@@ -198,7 +198,8 @@ class AvaloniaNative : public ComSingleObject<IAvaloniaNativeFactory, &IID_IAval
 public:
     FORWARD_IUNKNOWN()
     
-    virtual ~AvaloniaNative() override {
+    virtual ~AvaloniaNative() override
+    {
         ReleaseAvnAppEvents();
         _deallocator = nullptr;
         _dispatcher = nullptr;
diff --git a/src/Avalonia.Native/AvaloniaNativePlatform.cs b/src/Avalonia.Native/AvaloniaNativePlatform.cs
index efc29cc06b..b7c58cded9 100644
--- a/src/Avalonia.Native/AvaloniaNativePlatform.cs
+++ b/src/Avalonia.Native/AvaloniaNativePlatform.cs
@@ -162,12 +162,12 @@ namespace Avalonia.Native
 
             Compositor = new Compositor(_platformGraphics, true);
 
-            Dispatcher.UIThread.ShutdownFinished += OnDispatcherShutdownFinished;
+            AppDomain.CurrentDomain.ProcessExit += OnProcessExit;
         }
 
-        private void OnDispatcherShutdownFinished(object? sender, EventArgs e)
+        private void OnProcessExit(object? sender, EventArgs e)
         {
-            Dispatcher.UIThread.ShutdownFinished -= OnDispatcherShutdownFinished;
+            AppDomain.CurrentDomain.ProcessExit -= OnProcessExit;
             _factory.Dispose();
         }