From bef5d7d459f9329ab996820084cbb90b2e765a7b Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Tue, 2 Jul 2024 15:15:47 +0200 Subject: [PATCH] Check for null ItemsView. --- .../Selection/TreeSelectedItems.cs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/Avalonia.Controls.TreeDataGrid/Selection/TreeSelectedItems.cs b/src/Avalonia.Controls.TreeDataGrid/Selection/TreeSelectedItems.cs index 19494388..7ec49a79 100644 --- a/src/Avalonia.Controls.TreeDataGrid/Selection/TreeSelectedItems.cs +++ b/src/Avalonia.Controls.TreeDataGrid/Selection/TreeSelectedItems.cs @@ -52,15 +52,18 @@ public T? this[int index] private IEnumerable EnumerateNode(TreeSelectionNode node) { - foreach (var range in node.Ranges) + if (node.ItemsView is not null) { - for (var i = range.Begin; i <= range.End; ++i) + foreach (var range in node.Ranges) { - yield return node.ItemsView![i]; + for (var i = range.Begin; i <= range.End; ++i) + { + yield return node.ItemsView[i]; + } } } - if (node.Children is object) + if (node.Children is not null) { foreach (var child in node.Children) { @@ -110,4 +113,4 @@ public TreeSelectedItems(TreeSelectionModelBase root) : base(root) { } yield return i; } } -} \ No newline at end of file +}