From 8a3e878a7f20f990d250acf5a56865126a2c4157 Mon Sep 17 00:00:00 2001 From: Curtis Wensley Date: Tue, 27 Feb 2024 14:29:52 -0800 Subject: [PATCH] Wpf: protect against errors in GridView.SelectedRows --- src/Eto.Wpf/Forms/Controls/GridHandler.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Eto.Wpf/Forms/Controls/GridHandler.cs b/src/Eto.Wpf/Forms/Controls/GridHandler.cs index e6b42dc1bc..0d0f7e6132 100755 --- a/src/Eto.Wpf/Forms/Controls/GridHandler.cs +++ b/src/Eto.Wpf/Forms/Controls/GridHandler.cs @@ -642,7 +642,12 @@ public IEnumerable SelectedRows Control.SelectedItems.Clear(); foreach (int row in value) { - Control.SelectedItems.Add(list[row]); + // protect against any incorrect info + if (row >= list.Count) + continue; + var item = list[row]; + if (item != null) + Control.SelectedItems.Add(item); } Control.EndUpdateSelectedItems();