Merge pull request #3946 from batzen/issues/3944

(GH-3944) Use BeginInvoke to prevent deadlocks in multithreaded cases
MahApps · Oct 23, 2020 · 844f85f · 844f85f
2 parents a8ea723 + f318a4f
commit 844f85f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/MahApps.Metro/Behaviors/WindowsSettingBehavior.cs b/src/MahApps.Metro/Behaviors/WindowsSettingBehavior.cs
@@ -47,7 +47,7 @@ private void AssociatedObject_SourceInitialized(object sender, EventArgs e)
  window.Closed += this.AssociatedObject_Closed;
 
  // This operation must be thread safe
- Application.Current?.Invoke(() => Application.Current.SessionEnding += this.CurrentApplicationSessionEnding);
+ Application.Current?.BeginInvoke(() => Application.Current.SessionEnding += this.CurrentApplicationSessionEnding); 
  }
 
  private void AssociatedObject_Closing(object sender, System.ComponentModel.CancelEventArgs e)
@@ -93,7 +93,7 @@ private void CleanUp(string fromWhere)
  window.SourceInitialized -= this.AssociatedObject_SourceInitialized;
 
  // This operation must be thread safe
- Application.Current?.Invoke(() => Application.Current.SessionEnding -= this.CurrentApplicationSessionEnding);
+ Application.Current?.BeginInvoke(() => Application.Current.SessionEnding -= this.CurrentApplicationSessionEnding);
  }
 
 #pragma warning disable 618