Merge pull request #301 from AvaloniaUI/fixes/nre-treeselecteditems

Check for null ItemsView in TreeSelectedItems.
AvaloniaUI · Jul 3, 2024 · d5d6496 · d5d6496
2 parents a0da097 + 7ff0fe3
commit d5d6496
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/Avalonia.Controls.TreeDataGrid/Selection/TreeSelectedItems.cs b/src/Avalonia.Controls.TreeDataGrid/Selection/TreeSelectedItems.cs
@@ -56,7 +56,8 @@ public T? this[int index]
             {
                 for (var i = range.Begin; i <= range.End; ++i)
                 {
-                    yield return node.ItemsView![i];
+                    if (node.ItemsView is not null)
+                        yield return node.ItemsView[i];
                 }
             }
 
@@ -110,4 +111,4 @@ public TreeSelectedItems(TreeSelectionModelBase<T> root) : base(root) { }
                 yield return i;
         }
     }
-}
+}