Fix headless race condition (#20143)

2025-11-27 10:01:10 +01:00
parent 55a0b5b1c6
commit 656c98a863
1 changed files with 18 additions and 4 deletions
@@ -138,11 +138,25 @@ public static class HeadlessWindowExtensions

    private static void RunJobsOnImpl(this TopLevel topLevel, Action<IHeadlessWindow> action)
    {
-        Dispatcher.UIThread.RunJobs();
-        AvaloniaHeadlessPlatform.ForceRenderTimerTick();
-        Dispatcher.UIThread.RunJobs();
+        RunJobsAndRender();
        action(GetImpl(topLevel));
-        Dispatcher.UIThread.RunJobs();
+        RunJobsAndRender();
+
+        void RunJobsAndRender()
+        {
+            var count = 0;
+            var dispatcher = Dispatcher.UIThread;
+
+            while (dispatcher.HasJobsWithPriority(DispatcherPriority.MinimumActiveValue))
+            {
+                if (count >= 10)
+                    throw new InvalidOperationException("Dispatcher job loop detected");
+
+                dispatcher.RunJobs();
+                AvaloniaHeadlessPlatform.ForceRenderTimerTick();
+                ++count;
+            }
+        }
    }

    private static IHeadlessWindow GetImpl(this TopLevel topLevel)