From 65d1471a94e2cb55a586a6970043906d95ebdff6 Mon Sep 17 00:00:00 2001
From: javidsho <javidsoft@yahoo.com>
Date: Sun, 10 Jul 2022 22:09:31 +0430
Subject: [PATCH] Fix null pointer exception on application exit

---
 src/Avalonia.Controls/TrayIcon.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/TrayIcon.cs b/src/Avalonia.Controls/TrayIcon.cs
index 2ccb03e447..20c8dff8ea 100644
--- a/src/Avalonia.Controls/TrayIcon.cs
+++ b/src/Avalonia.Controls/TrayIcon.cs
@@ -189,7 +189,10 @@ namespace Avalonia.Controls
             var app = Application.Current ?? throw new InvalidOperationException("Application not yet initialized.");
             var trayIcons = GetIcons(app);
 
-            RemoveIcons(trayIcons);
+            if (trayIcons != null)
+            {
+                RemoveIcons(trayIcons);
+            }
         }
 
         private static void Icons_CollectionChanged(object? sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)