Tweaks

LifeIsJourney · Sep 21, 2023 · 3ed28e5 · 3ed28e5
1 parent be8dbe8
commit 3ed28e5
Showing 1 changed file with 11 additions and 29 deletions.
diff --git a/src/UniTask/Assets/Plugins/UniTask/Runtime/External/DOTween/DOTweenAsyncExtensions.cs b/src/UniTask/Assets/Plugins/UniTask/Runtime/External/DOTween/DOTweenAsyncExtensions.cs
@@ -251,30 +251,7 @@ public static IUniTaskSource Create(Tween tween, TweenCancelBehaviour cancelBeha
                                 source.tween.Complete(true);
                                 break;
                             case TweenCancelBehaviour.CancelAwait:
-                                // restore to original callback
-                                switch (callbackType)
-                                {
-                                    case CallbackType.Kill:
-                                        tween.onKill = source.originalCompleteAction;
-                                        break;
-                                    case CallbackType.Complete:
-                                        tween.onComplete = source.originalCompleteAction;
-                                        break;
-                                    case CallbackType.Pause:
-                                        tween.onPause = source.originalCompleteAction;
-                                        break;
-                                    case CallbackType.Play:
-                                        tween.onPlay = source.originalCompleteAction;
-                                        break;
-                                    case CallbackType.Rewind:
-                                        tween.onRewind = source.originalCompleteAction;
-                                        break;
-                                    case CallbackType.StepComplete:
-                                        tween.onStepComplete = source.originalCompleteAction;
-                                        break;
-                                    default:
-                                        break;
-                                }
+                                source.RestoreOriginalCallback();
                                 source.core.TrySetCanceled(source.cancellationToken);
                                 break;
                         }
@@ -379,6 +356,16 @@ bool TryReturn()
                 core.Reset();
                 cancellationRegistration.Dispose();
 
+                RestoreOriginalCallback();
+
+                tween = default;
+                cancellationToken = default;
+                originalCompleteAction = default;
+                return pool.TryPush(this);
+            }
+
+            void RestoreOriginalCallback()
+            {
                 switch (callbackType)
                 {
                     case CallbackType.Kill:
@@ -402,11 +389,6 @@ bool TryReturn()
                     default:
                         break;
                 }
-
-                tween = default;
-                cancellationToken = default;
-                originalCompleteAction = default;
-                return pool.TryPush(this);
             }
         }
     }