Merge pull request #83 from zerodev1200/fix-synccontext-thread-handling

Improve synchronization handling in event dispatcher
Cysharp · Oct 21, 2024 · a4d80bd · a4d80bd
2 parents c1c9d86 + 43357a5
commit a4d80bd
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/ObservableCollections/ICollectionEventDispatcher.cs b/src/ObservableCollections/ICollectionEventDispatcher.cs
@@ -35,7 +35,16 @@ public SynchronizationContextCollectionEventDispatcher(SynchronizationContext sy
 
         public void Post(CollectionEventDispatcherEventArgs ev)
         {
-            synchronizationContext.Post(callback, ev);
+            if (SynchronizationContext.Current == null)
+            {
+                // non-UI thread, post the event asynchronously
+                synchronizationContext.Post(callback, ev);
+            }
+            else
+            {
+                // UI thread, send the event synchronously
+                synchronizationContext.Send(callback, ev);
+            }
         }
 
         static void SendOrPostCallback(object? state)