Wpf: Fix issue restoring column focus if the column has been removed

picoe · Sep 10, 2024 · 30e59e6 · 30e59e6
1 parent 9bbc8d4
commit 30e59e6
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/Eto.Wpf/Forms/Controls/GridHandler.cs b/src/Eto.Wpf/Forms/Controls/GridHandler.cs
@@ -847,7 +847,13 @@ protected void RestoreColumnFocus()
 		{
 			Control.CurrentColumn = null;
 			if (Control.Columns.Count > 0)
-				Control.CurrentCell = new swc.DataGridCellInfo(Control.SelectedItem, CurrentColumn ?? Control.CurrentColumn ?? Control.Columns[0]);
+			{
+				// ensure the saved column still exists in the grid, it could be removed by user logic
+				if (CurrentColumn != null && Control.Columns.Contains(CurrentColumn))
+					Control.CurrentCell = new swc.DataGridCellInfo(Control.SelectedItem, CurrentColumn);
+				else
+					Control.CurrentCell = new swc.DataGridCellInfo(Control.SelectedItem, Control.CurrentColumn ?? Control.Columns[0]);
+			}
 			CurrentColumn = null;
 		}