Skip to content

Fix NullReferenceException in WindowsSettingBehavior #4058

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 28, 2021
Merged

Fix NullReferenceException in WindowsSettingBehavior #4058

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions src/MahApps.Metro/Behaviors/WindowsSettingBehavior.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down