From 2b1ab99d6ea69a4006d9ce682d5b2055fb954340 Mon Sep 17 00:00:00 2001 From: Max Katz Date: Wed, 10 May 2023 01:49:47 -0400 Subject: [PATCH] Fix window duplicates on macos --- .../ClassicDesktopStyleApplicationLifetime.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Avalonia.Controls/ApplicationLifetimes/ClassicDesktopStyleApplicationLifetime.cs b/src/Avalonia.Controls/ApplicationLifetimes/ClassicDesktopStyleApplicationLifetime.cs index 316643737e..77f3b93efa 100644 --- 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()