From 168ea39dc2e36b448d5b4c852dc03a15ad6d1567 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 8 Mar 2021 00:09:22 +0100
Subject: [PATCH] Added removal for Storyboard completion handler

---
 .../Extensions/StoryboardAnimations.cs                   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/StoryboardAnimations.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/StoryboardAnimations.cs
index 0a67e640ead..7b60d07b266 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/StoryboardAnimations.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/StoryboardAnimations.cs
@@ -23,7 +23,14 @@ public static Task BeginAsync(this Storyboard storyboard)
         {
             TaskCompletionSource<object?> taskCompletionSource = new TaskCompletionSource<object?>();
 
-            storyboard.Completed += (_, _) => taskCompletionSource.SetResult(null);
+            void OnCompleted(object sender, object e)
+            {
+                ((Storyboard)sender).Completed -= OnCompleted;
+
+                taskCompletionSource.SetResult(null);
+            }
+
+            storyboard.Completed += OnCompleted;
 
             storyboard.Begin();