Fixed an issue with thread-safety

mysteryx93 · Jun 8, 2022 · dc4ba83 · dc4ba83
1 parent 75057a6
commit dc4ba83
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## 1.2.3 - 2002-06-07
+
+- Fixed an issue with thread-safety
+
 ## 1.2.2 - 2002-06-07
 
 - DialogManager is now thread-safe, dispatching UI calls to the UI thread

diff --git a/src/MvvmDialogs.Avalonia/DialogManager.cs b/src/MvvmDialogs.Avalonia/DialogManager.cs
@@ -36,8 +36,8 @@ public DialogManager(IViewLocator? viewLocator = null,
         Windows.FirstOrDefault(x => ReferenceEquals(viewModel, x.DataContext)).AsWrapper();
 
     /// <inheritdoc />
-    protected override void Dispatch(Action action) => _dispatcher.Post(action);
+    protected override void Dispatch(Action action) => _dispatcher.Post(action, DispatcherPriority.Render);
 
     /// <inheritdoc />
-    protected override Task<T> DispatchAsync<T>(Func<T> action) => _dispatcher.InvokeAsync(action);
+    protected override Task<T> DispatchAsync<T>(Func<T> action) => _dispatcher.InvokeAsync(action, DispatcherPriority.Render);
 }
diff --git a/src/MvvmDialogs.Avalonia/MvvmDialogs.Avalonia.csproj b/src/MvvmDialogs.Avalonia/MvvmDialogs.Avalonia.csproj
@@ -9,8 +9,8 @@
     <AssemblyTitle>MVVM Dialogs for Avalonia</AssemblyTitle>
     <Title>MVVM Dialogs for Avalonia</Title>
     <AssemblyOriginatorKeyFile>..\..\StrongName.snk</AssemblyOriginatorKeyFile>
-    <AssemblyVersion>1.2.2</AssemblyVersion>
-    <PackageVersion>1.2.2</PackageVersion>
+    <AssemblyVersion>1.2.3</AssemblyVersion>
+    <PackageVersion>1.2.3</PackageVersion>
     <Copyright>Copyright © 2009-2022 MVVM Dialogs contributors</Copyright>
     <Product>HanumanInstitute.MvvmDialogs</Product>
     <PackageId>HanumanInstitute.MvvmDialogs.Avalonia</PackageId>

diff --git a/src/MvvmDialogs.Wpf/DialogManager.cs b/src/MvvmDialogs.Wpf/DialogManager.cs
@@ -59,9 +59,9 @@ public TResult ShowFrameworkDialog<TSettings, TResult>(INotifyPropertyChanged ow
             Windows.FirstOrDefault(x => ReferenceEquals(viewModel, x.DataContext)).AsWrapper();
 
         /// <inheritdoc />
-        protected override void Dispatch(Action action) => _dispatcher.Invoke(action);
+        protected override void Dispatch(Action action) => _dispatcher.Invoke(action, DispatcherPriority.Render);
 
         /// <inheritdoc />
-        protected override Task<T> DispatchAsync<T>(Func<T> action) => _dispatcher.InvokeAsync(action).Task;
+        protected override Task<T> DispatchAsync<T>(Func<T> action) => _dispatcher.InvokeAsync(action, DispatcherPriority.Render).Task;
     }
 }
diff --git a/src/MvvmDialogs.Wpf/MvvmDialogs.Wpf.csproj b/src/MvvmDialogs.Wpf/MvvmDialogs.Wpf.csproj
@@ -10,8 +10,8 @@
     <Title>MVVM Dialogs for WPF</Title>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\StrongName.snk</AssemblyOriginatorKeyFile>
-    <AssemblyVersion>1.2.2</AssemblyVersion>
-    <PackageVersion>1.2.2</PackageVersion>
+    <AssemblyVersion>1.2.3</AssemblyVersion>
+    <PackageVersion>1.2.3</PackageVersion>
     <Copyright>Copyright © 2009-2022 MVVM Dialogs contributors</Copyright>
     <Product>HanumanInstitute.MvvmDialogs</Product>
     <PackageId>HanumanInstitute.MvvmDialogs.Wpf</PackageId>

diff --git a/src/MvvmDialogs/DialogManagerBase.cs b/src/MvvmDialogs/DialogManagerBase.cs
@@ -41,11 +41,11 @@ protected DialogManagerBase(IViewLocator viewLocator, IFrameworkDialogFactory fr
     /// <inheritdoc />
     public virtual void Show(INotifyPropertyChanged ownerViewModel, INotifyPropertyChanged viewModel)
     {
-        var view = ViewLocator.Locate(viewModel);
-        Logger?.LogInformation("View: {View}; ViewModel: {ViewModel}; Owner: {OwnerViewModel}", view?.GetType(), viewModel.GetType(), ownerViewModel.GetType());
-
         Dispatch(() =>
         {
+            var view = ViewLocator.Locate(viewModel);
+            Logger?.LogInformation("View: {View}; ViewModel: {ViewModel}; Owner: {OwnerViewModel}", view?.GetType(), viewModel.GetType(), ownerViewModel.GetType());
+
             var dialog = CreateDialog(ownerViewModel, viewModel, view);
             dialog.Show();
         });
@@ -54,16 +54,16 @@ public virtual void Show(INotifyPropertyChanged ownerViewModel, INotifyPropertyC
     /// <inheritdoc />
     public virtual async Task ShowDialogAsync(INotifyPropertyChanged ownerViewModel, IModalDialogViewModel viewModel)
     {
-        var view = ViewLocator.Locate(viewModel);
-        Logger?.LogInformation("View: {View}; ViewModel: {ViewModel}; Owner: {OwnerViewModel}", view?.GetType(), viewModel.GetType(), ownerViewModel.GetType());
-
-        await await DispatchAsync(() =>
+        await await DispatchAsync(async () =>
         {
+            var view = ViewLocator.Locate(viewModel);
+            Logger?.LogInformation("View: {View}; ViewModel: {ViewModel}; Owner: {OwnerViewModel}", view?.GetType(), viewModel.GetType(), ownerViewModel.GetType());
+
             var dialog = CreateDialog(ownerViewModel, viewModel, view);
-            return dialog.ShowDialogAsync();
-        });
+            await dialog.ShowDialogAsync();
 
-        Logger?.LogInformation("View: {View}; Result: {Result}", view?.GetType(), viewModel.DialogResult);
+            Logger?.LogInformation("View: {View}; Result: {Result}", view?.GetType(), viewModel.DialogResult);
+        });
     }
 
     /// <summary>

diff --git a/src/MvvmDialogs/MvvmDialogs.csproj b/src/MvvmDialogs/MvvmDialogs.csproj
@@ -10,8 +10,8 @@
     <Title>MVVM Dialogs</Title>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\StrongName.snk</AssemblyOriginatorKeyFile>
-    <AssemblyVersion>1.2.2</AssemblyVersion>
-    <PackageVersion>1.2.2</PackageVersion>
+    <AssemblyVersion>1.2.3</AssemblyVersion>
+    <PackageVersion>1.2.3</PackageVersion>
     <Copyright>Copyright © 2009-2022 MVVM Dialogs contributors</Copyright>
     <Product>HanumanInstitute.MvvmDialogs</Product>
     <PackageId>HanumanInstitute.MvvmDialogs</PackageId>