Merge pull request #488 from Cysharp/revert-445-fix-wait-async

Revert "Fixed #444"

src/UniTask/Assets/Plugins/UniTask/Runtime/TriggerEvent.cs

@@ -20,6 +20,8 @@ public struct TriggerEvent<T>
     {
         ITriggerHandler<T> head; // head.prev is last
         ITriggerHandler<T> iteratingHead;
+
+        bool preserveRemoveSelf;
         ITriggerHandler<T> iteratingNode;
 
         void LogError(Exception ex)
@@ -42,7 +44,6 @@ public void SetResult(T value)
             while (h != null)
             {
                 iteratingNode = h;
-                var next = h.Next;
 
                 try
                 {
@@ -54,7 +55,18 @@ public void SetResult(T value)
                     Remove(h);
                 }
 
-                h = next;
+                if (preserveRemoveSelf)
+                {
+                    preserveRemoveSelf = false;
+                    iteratingNode = null;
+                    var next = h.Next;
+                    Remove(h);
+                    h = next;
+                }
+                else
+                {
+                    h = h.Next;
+                }
             }
 
             iteratingNode = null;
@@ -84,7 +96,8 @@ public void SetCanceled(CancellationToken cancellationToken)
                 {
                     LogError(ex);
                 }
-
+
+                preserveRemoveSelf = false;
                 iteratingNode = null;
                 var next = h.Next;
                 Remove(h);
@@ -118,7 +131,8 @@ public void SetCompleted()
                 {
                     LogError(ex);
                 }
-
+
+                preserveRemoveSelf = false;
                 iteratingNode = null;
                 var next = h.Next;
                 Remove(h);
@@ -152,7 +166,8 @@ public void SetError(Exception exception)
                 {
                     LogError(ex);
                 }
-
+
+                preserveRemoveSelf = false;
                 iteratingNode = null;
                 var next = h.Next;
                 Remove(h);
@@ -225,64 +240,72 @@ public void Add(ITriggerHandler<T> handler)
         public void Remove(ITriggerHandler<T> handler)
         {
             if (handler == null) throw new ArgumentNullException(nameof(handler));
-
-            var prev = handler.Prev;
-            var next = handler.Next;
 
-            if (next != null)
+            if (iteratingNode != null && iteratingNode == handler)
             {
-                next.Prev = prev;
-            }
-
-            if (handler == head)
-            {
-                head = next;
-            }
-            else if (handler == iteratingHead)
-            {
-                iteratingHead = next;
+                // if remove self, reserve remove self after invoke completed.
+                preserveRemoveSelf = true;
             }
             else
             {
-                // when handler is head, prev indicate last so don't use it.
-                if (prev != null)
+                var prev = handler.Prev;
+                var next = handler.Next;
+
+                if (next != null)
                 {
-                    prev.Next = next;
+                    next.Prev = prev;
                 }
-            }
 
-            if (head != null)
-            {
-                if (head.Prev == handler)
+                if (handler == head)
                 {
-                    if (prev != head)
-                    {
-                        head.Prev = prev;
-                    }
-                    else
+                    head = next;
+                }
+                else if (handler == iteratingHead)
+                {
+                    iteratingHead = next;
+                }
+                else
+                {
+                    // when handler is head, prev indicate last so don't use it.
+                    if (prev != null)
                     {
-                        head.Prev = null;
+                        prev.Next = next;
                     }
                 }
-            }
 
-            if (iteratingHead != null)
-            {
-                if (iteratingHead.Prev == handler)
+                if (head != null)
                 {
-                    if (prev != iteratingHead.Prev)
+                    if (head.Prev == handler)
                     {
-                        iteratingHead.Prev = prev;
+                        if (prev != head)
+                        {
+                            head.Prev = prev;
+                        }
+                        else
+                        {
+                            head.Prev = null;
+                        }
                     }
-                    else
+                }
+
+                if (iteratingHead != null)
+                {
+                    if (iteratingHead.Prev == handler)
                     {
-                        iteratingHead.Prev = null;
+                        if (prev != iteratingHead.Prev)
+                        {
+                            iteratingHead.Prev = prev;
+                        }
+                        else
+                        {
+                            iteratingHead.Prev = null;
+                        }
                     }
                 }
-            }
 
-            handler.Prev = null;
-            handler.Next = null;
+                handler.Prev = null;
+                handler.Next = null;
+            }
         }
     }
 }