fixed task cancelled crash

MitchBomcanhao · Jun 7, 2019 · 2775d95 · 2775d95
1 parent c13b9f0
commit 2775d95
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/TouchEffect/TouchVisualManager.cs b/TouchEffect/TouchVisualManager.cs
@@ -341,13 +341,15 @@ private async Task SetRotationYAsync(ITouchEff sender, TouchState state, int dur
 
         private Task GetAnimationTask(ITouchEff sender, TouchState state, double? durationMultiplier = null)
         {
+            var token = _animationTokenSource.Token;
+
             var duration = (state == TouchState.Regular
                 ? sender.RegularAnimationDuration
                 : sender.PressedAnimationDuration).AdjustDurationMultiplier(durationMultiplier);
 
             sender.RaiseAnimationStarted(state, duration);
             return Task.WhenAll(
-                _customAnimationTaskGetter?.Invoke(sender, state, duration, _animationTokenSource.Token) ?? Task.FromResult(true),
+                _customAnimationTaskGetter?.Invoke(sender, state, duration, token) ?? Task.FromResult(true),
                 SetBackgroundColorAsync(sender, state, duration),
                 SetOpacityAsync(sender, state, duration),
                 SetScaleAsync(sender, state, duration),
@@ -363,11 +365,14 @@ private Task GetAnimationTask(ITouchEff sender, TouchState state, double? durati
                     for (var progress = AnimationProgressDelay; progress < duration; progress += AnimationProgressDelay)
                     {
                         await Task.Delay(AnimationProgressDelay).ConfigureAwait(false);
+                        if (token.IsCancellationRequested)
+                        {
+                            return;
+                        }
                         _animationProgress = (double)progress / duration;
                     }
                     _animationProgress = 1;
-
-                }, _animationTokenSource.Token));
+                }));
         }
     }
 }