Merge pull request #453 from JetBrains/ww898-fix-SpinUntil

Grant the condition call if `SpinUntil()` has zero timeout.
JetBrains · Dec 12, 2023 · 3667470 · 3667470
2 parents 1823afd + 186a35f
commit 3667470
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/rd-net/Lifetimes/Threading/SpinWaitEx.cs b/rd-net/Lifetimes/Threading/SpinWaitEx.cs
@@ -81,12 +81,15 @@ public static bool SpinUntil(Lifetime lifetime, long timeoutMs, Func<bool> condi
 
       while (true)
       {
-        if (!lifetime.IsAlive || Environment.TickCount - start > timeoutMs)
+        if (!lifetime.IsAlive)
           return false;
 
         if (condition())
           return true;
 
+        if (Environment.TickCount - start > timeoutMs)
+          return false;
+
 #if !NET35
         s.SpinOnce();
 #else