Merge pull request #6146 from FoggyFinder/issue6127

Prevent `ScrollSlotIntoView` from crashing on start
AvaloniaUI · Jul 1, 2021 · 59f8996 · 59f8996
2 parents b54a965 + 11a6d04
commit 59f8996
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/Avalonia.Controls.DataGrid/DataGridRows.cs b/src/Avalonia.Controls.DataGrid/DataGridRows.cs
@@ -425,7 +425,7 @@ internal bool ScrollSlotIntoView(int slot, bool scrolledHorizontally)
                 UpdateDisplayedRows(DisplayData.FirstScrollingSlot, CellsHeight);
             }
 
-            if (DisplayData.FirstScrollingSlot < slot && DisplayData.LastScrollingSlot > slot)
+            if (DisplayData.FirstScrollingSlot < slot && (DisplayData.LastScrollingSlot > slot || DisplayData.LastScrollingSlot == -1))
             {
                 // The row is already displayed in its entirety
                 return true;