Fix #9456

gitextensions · Aug 8, 2021 · 6675b4e · 6675b4e
1 parent 9f551ea
commit 6675b4e
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/GitUI/UserControls/RevisionGrid/RevisionDataGridView.cs b/GitUI/UserControls/RevisionGrid/RevisionDataGridView.cs
@@ -558,6 +558,11 @@ private Task BackgroundUpdateAsync(CancellationToken cancellationToken)
                 int curCount;
                 do
                 {
+                    if (cancellationToken.IsCancellationRequested)
+                    {
+                        return Task.CompletedTask;
+                    }
+
                     scrollTo = _backgroundScrollTo;
                     curCount = _revisionGraph.GetCachedCount();
                     UpdateGraph(curCount, scrollTo);
@@ -574,6 +579,11 @@ private Task BackgroundUpdateAsync(CancellationToken cancellationToken)
 
             void UpdateGraph(int fromIndex, int toIndex)
             {
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    return;
+                }
+
                 // Cache the next item
                 _revisionGraph.CacheTo(toIndex, Math.Min(fromIndex + 1500, toIndex));
 
@@ -584,6 +594,11 @@ void UpdateGraph(int fromIndex, int toIndex)
 
                 void UpdateRowCount(int row)
                 {
+                    if (cancellationToken.IsCancellationRequested)
+                    {
+                        return;
+                    }
+
                     if (RowCount < _revisionGraph.Count)
                     {
                         SetRowCountAndSelectRowsIfReady(_revisionGraph.Count);