Backport RemoveIcons NRE fix

AvaloniaUI · Jul 20, 2022 · 855a193 · 855a193
1 parent dd8ed9c
commit 855a193
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/Avalonia.Controls/TrayIcon.cs b/src/Avalonia.Controls/TrayIcon.cs
@@ -199,7 +199,8 @@ private static void Lifetime_Exit(object sender, ControlledApplicationLifetimeEx
 
         private static void Icons_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
         {
-            RemoveIcons(e.OldItems.Cast<TrayIcon>());
+            if (e.OldItems is not null)
+                RemoveIcons(e.OldItems.Cast<TrayIcon>());
         }
 
         private static void RemoveIcons(IEnumerable<TrayIcon> icons)