(GH-4013) Fix NullReferenceException in WindowsSettingBehavior

MahApps · Feb 28, 2021 · 1fe3a59 · 1fe3a59
1 parent 7171d3a
commit 1fe3a59
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/src/MahApps.Metro/Behaviors/WindowsSettingBehavior.cs b/src/MahApps.Metro/Behaviors/WindowsSettingBehavior.cs
@@ -47,7 +47,14 @@ private void AssociatedObject_SourceInitialized(object sender, EventArgs e)
             window.Closed += this.AssociatedObject_Closed;
 
             // This operation must be thread safe
-            Application.Current?.BeginInvoke(() => Application.Current.SessionEnding += this.CurrentApplicationSessionEnding); 
+            window.BeginInvoke(() =>
+                {
+                    var application = Application.Current;
+                    if (application != null)
+                    {
+                        application.SessionEnding += this.CurrentApplicationSessionEnding;
+                    }
+                }); 
         }
 
         private void AssociatedObject_Closing(object sender, System.ComponentModel.CancelEventArgs e)
@@ -93,7 +100,14 @@ private void CleanUp(string fromWhere)
             window.SourceInitialized -= this.AssociatedObject_SourceInitialized;
 
             // This operation must be thread safe
-            Application.Current?.BeginInvoke(() => Application.Current.SessionEnding -= this.CurrentApplicationSessionEnding);
+            window.BeginInvoke(() =>
+                {
+                    var application = Application.Current;
+                    if (application != null)
+                    {
+                        application.SessionEnding -= this.CurrentApplicationSessionEnding;
+                    }
+                });
         }
 
 #pragma warning disable 618