Merge pull request #6362 from AvaloniaUI/fixes/internal-runloop-cancel

Respect CancellationToken in InternalPlatformThreadingInterface.RunLoop.
AvaloniaUI · Aug 16, 2021 · 01acb49 · 01acb49
1 parent 81be6e2
commit 01acb49
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/Avalonia.Controls/Platform/InternalPlatformThreadingInterface.cs b/src/Avalonia.Controls/Platform/InternalPlatformThreadingInterface.cs
@@ -21,10 +21,12 @@ public InternalPlatformThreadingInterface()
 
         public void RunLoop(CancellationToken cancellationToken)
         {
-            while (true)
+            var handles = new[] { _signaled, cancellationToken.WaitHandle };
+
+            while (!cancellationToken.IsCancellationRequested)
             {
                 Signaled?.Invoke(null);
-                _signaled.WaitOne();
+                WaitHandle.WaitAny(handles);
             }
         }