Add Subject.Dispose(bool callOnCompleted)

Cysharp · Aug 19, 2024 · 5eb7024 · 5eb7024
1 parent ae91aab
commit 5eb7024
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/R3/Subject.cs b/src/R3/Subject.cs
@@ -231,20 +231,30 @@ void ThrowIfDisposed()
     }
 
     public void Dispose()
+    {
+        Dispose(true);
+    }
+
+    public void Dispose(bool callOnCompleted)
     {
         if (completeState.TrySetDisposed(out var alreadyCompleted))
         {
-            if (!alreadyCompleted)
+            if (!alreadyCompleted && callOnCompleted)
             {
                 var currentVersion = GetVersion();
                 var node = root;
+                Volatile.Write(ref root, null);
                 while (node != null)
                 {
                     if (node.Version > currentVersion) break;
                     node.Observer.OnCompleted();
                     node = node.Next;
                 }
             }
+            else
+            {
+                Volatile.Write(ref root, null);
+            }
         }
     }