#8261 - terminating WinUIComposition loop on process exit to avoid crashes

3 years ago · a09db71356
1 changed files with 5 additions and 1 deletions
--- a/src/Windows/Avalonia.Win32/WinRT/Composition/WinUICompositorConnection.cs
+++ b/src/Windows/Avalonia.Win32/WinRT/Composition/WinUICompositorConnection.cs
@ -120,10 +120,14 @@ namespace Avalonia.Win32.WinRT.Composition

        private void RunLoop()
        {
+            var cts = new CancellationTokenSource();
+            AppDomain.CurrentDomain.ProcessExit += (sender, args) =>
+                cts.Cancel();
+                
            using (var act = _compositor5.RequestCommitAsync())
                act.SetCompleted(new RunLoopHandler(this));

-            while (true)
+            while (!cts.IsCancellationRequested)
            {
                UnmanagedMethods.GetMessage(out var msg, IntPtr.Zero, 0, 0);
                lock (_pumpLock)