Handle some nulls

picoe · Apr 15, 2024 · 8ddba71 · 8ddba71
1 parent 5453569
commit 8ddba71
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/Eto.Gtk/Forms/Controls/GridHandler.cs b/src/Eto.Gtk/Forms/Controls/GridHandler.cs
@@ -145,7 +145,10 @@ protected override void Initialize()
 				if (!AllowEmptySelection && AllowMultipleSelection && Control.Selection.CountSelectedRows() == 0)
 				{
 					Control.GetCursor(out var cursorRow, out _);
-					Control.Selection.SelectPath(cursorRow);
+					if (cursorRow != null)
+					{
+						Control.Selection.SelectPath(cursorRow);
+					}
 				}
 			};
 
@@ -737,11 +740,12 @@ private void SetSelectionMode(bool allowEmptySelection, bool allowMultipleSelect
 				    && newMode is Gtk.SelectionMode.Single or Gtk.SelectionMode.Browse)
 				{
 					Control.GetCursor(out var cursorRowPath, out _);
-					var cursorWasSelected = Control.Selection.PathIsSelected(cursorRowPath);
+					var mustReselectCursor = cursorRowPath != null && Control.Selection.PathIsSelected(cursorRowPath);
 
 					Control.Selection.Mode = Gtk.SelectionMode.None;
 					Control.Selection.Mode = newMode;
-					if (cursorWasSelected)
+
+					if (mustReselectCursor)
 					{
 						Control.Selection.SelectPath(cursorRowPath);
 					}