Correction synchronization

Author: Jean-Denis Kreiss

AlphaChiTech.Virtualization.Net4/PaginationManager.cs

@@ -862,7 +862,7 @@ private Task GetCountAsync(CancellationTokenSource cts)
                         if (!cts.IsCancellationRequested)
                             this.RaiseCountChanged(true, _LocalCount);
                         RemovePageRequest(Int32.MinValue);
-                    });
+                    }, TaskScheduler.FromCurrentSynchronizationContext());
             }
             else
             {

AlphaChiTech.Virtualization.Net4/VirtualizingObservableCollection.cs

@@ -511,27 +511,24 @@ public bool SupressEventErrors
         /// <param name="args">The <see cref="NotifyCollectionChangedEventArgs"/> instance containing the event data.</param>
         internal void RaiseCollectionChangedEvent(NotifyCollectionChangedEventArgs args)
         {
-            Application.Current.Dispatcher.Invoke(new Action(() =>
-            {
-                if (_BulkCount > 0) return;
+            if (_BulkCount > 0) return;
 
-                var evnt = CollectionChanged;
+            var evnt = CollectionChanged;
 
-                if (evnt != null)
+            if (evnt != null)
+            {
+                try
                 {
-                    try
-                    {
-                        evnt(this, args);
-                    }
-                    catch (Exception ex)
+                    evnt(this, args);
+                }
+                catch (Exception ex)
+                {
+                    if (!this.SupressEventErrors)
                     {
-                        if (!this.SupressEventErrors)
-                        {
-                            throw ex;
-                        }
+                        throw ex;
                     }
                 }
-            }));
+            }
         }
 
         #endregion INotifyCollectionChanged Implementation
@@ -777,7 +774,7 @@ public Task ResetAsync()
                 {
                     var count = t.Result;
                     this.ProviderAsync.OnReset(count);
-                });
+                }, TaskScheduler.FromCurrentSynchronizationContext());
             }
 
             lock(this)

DataGridAsyncDemo/MainWindow.xaml.cs

@@ -50,7 +50,7 @@ public MainWindow()
         //we’re using Dispatcher.Invoke to give the VirtualizationManager access
         //to the dispatcher thread, and using a DispatcherTimer to run the background
         //operations the VirtualizationManager needs to run to reclaim pages and manage memory.
-        VirtualizationManager.Instance.UIThreadExcecuteAction = a => Dispatcher.Invoke( a );
+        VirtualizationManager.Instance.UIThreadExcecuteAction = a => Application.Current.Dispatcher.Invoke( a );
         new DispatcherTimer( TimeSpan.FromMilliseconds( 10 ),
                              DispatcherPriority.Background,
                              delegate