Merge pull request #8683 from AvaloniaUI/stop-transition-if-it-was-ca…

…ncelled Stop TransitioningContentControl if it was cancelled
AvaloniaUI · Aug 12, 2022 · 7627db1 · 7627db1
1 parent 7eb0a48
commit 7627db1
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/Avalonia.Controls/TransitioningContentControl.cs b/src/Avalonia.Controls/TransitioningContentControl.cs
@@ -84,13 +84,19 @@ private async void UpdateContentWithTransition(object? content)
 
         _lastTransitionCts?.Cancel();
         _lastTransitionCts = new CancellationTokenSource();
+        var localToken = _lastTransitionCts.Token;
 
         if (PageTransition != null)
-            await PageTransition.Start(this, null, true, _lastTransitionCts.Token);
+            await PageTransition.Start(this, null, true, localToken);
+
+        if (localToken.IsCancellationRequested)
+        {
+            return;
+        }
 
         CurrentContent = content;
 
         if (PageTransition != null)
-            await PageTransition.Start(null, this, true, _lastTransitionCts.Token);
+            await PageTransition.Start(null, this, true, localToken);
     }
 }