update TrayIcon.cs

AvaloniaUI · Jun 25, 2024 · 44e97f8 · 44e97f8
1 parent a6f7e44
commit 44e97f8
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/Avalonia.Controls/TrayIcon.cs b/src/Avalonia.Controls/TrayIcon.cs
@@ -63,13 +63,15 @@ static TrayIcon()
                     throw new InvalidOperationException("TrayIcon.Icons must be set on the Application.");
                 }
             });
-
-            var app = Application.Current ?? throw new InvalidOperationException("Application not yet initialized.");
-
-            if (app.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime lifetime)
+
+            Application.ApplicationCurrentInitialized += (sender, args) =>
             {
-                lifetime.Exit += Lifetime_Exit;
-            }
+                if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime lifetime)
+                {
+                    lifetime.Exit += Lifetime_Exit;
+                }
+            };
+
         }
 
         /// <summary>