Fix window duplicates on macos

3 years ago · 2b1ab99d6e
1 changed files with 5 additions and 1 deletions
--- a/src/Avalonia.Controls/ApplicationLifetimes/ClassicDesktopStyleApplicationLifetime.cs
+++ b/src/Avalonia.Controls/ApplicationLifetimes/ClassicDesktopStyleApplicationLifetime.cs
@ -36,7 +36,11 @@ namespace Avalonia.Controls.ApplicationLifetimes

        private static void OnWindowOpened(object? sender, RoutedEventArgs e)
        {
-            s_activeLifetime?._windows.Add((Window)sender!);
+            var window = (Window)sender!;
+            if (s_activeLifetime is not null && !s_activeLifetime._windows.Contains(window))
+            {
+                s_activeLifetime._windows.Add(window);
+            }
        }

        public ClassicDesktopStyleApplicationLifetime()