From fb9baae0125525856292857cd699a54626039828 Mon Sep 17 00:00:00 2001
From: Julien Lebosquain <julien@lebosquain.net>
Date: Wed, 31 May 2023 10:43:31 +0200
Subject: [PATCH] Fixed ManagedDispatcherImpl wait

---
 .../Platform/ManagedDispatcherImpl.cs                | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Controls/Platform/ManagedDispatcherImpl.cs b/src/Avalonia.Controls/Platform/ManagedDispatcherImpl.cs
index fdc098777a..c8225f775b 100644
--- a/src/Avalonia.Controls/Platform/ManagedDispatcherImpl.cs
+++ b/src/Avalonia.Controls/Platform/ManagedDispatcherImpl.cs
@@ -99,9 +99,15 @@ public class ManagedDispatcherImpl : IControlledDispatcherImpl
                 continue;
             }
 
-            if (_nextTimer != null)
+            TimeSpan? nextTimer;
+            lock (_lock)
+            {
+                nextTimer = _nextTimer;
+            }
+
+            if (nextTimer != null)
             {
-                var waitFor = _clock.Elapsed - _nextTimer.Value;
+                var waitFor = nextTimer.Value - _clock.Elapsed;
                 if (waitFor.TotalMilliseconds < 1)
                     continue;
                 _wakeup.WaitOne(waitFor);
@@ -112,4 +118,4 @@ public class ManagedDispatcherImpl : IControlledDispatcherImpl
 
         registration.Dispose();
     }
-}
\ No newline at end of file
+}