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

grokys · web-flow · commit d5d6496bc2a7 · 2024-07-03T09:33:53.000+02:00
Check for null ItemsView in TreeSelectedItems.
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;
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,8 @@ public T? this[int index]`
`56`	`56`	`{`
`57`	`57`	`for (var i = range.Begin; i <= range.End; ++i)`
`58`	`58`	`{`
`59`		`- yield return node.ItemsView![i];`
	`59`	`+ if (node.ItemsView is not null)`
	`60`	`+ yield return node.ItemsView[i];`
`60`	`61`	`}`
`61`	`62`	`}`
`62`	`63`
`@@ -110,4 +111,4 @@ public TreeSelectedItems(TreeSelectionModelBase<T> root) : base(root) { }`
`110`	`111`	`yield return i;`
`111`	`112`	`}`
`112`	`113`	`}`
`113`		`-}`
	`114`	`+}`