Skip to content

Fix: SnackbarPresenter might throw ObjectDisposedException, display problems. #1138

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
pomianowski merged 1 commit into from
Jul 24, 2024
Merged

Fix: SnackbarPresenter might throw ObjectDisposedException, display problems. #1138

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
39 changes: 38 additions & 1 deletion src/Wpf.Ui/Controls/Snackbar/SnackbarPresenter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,35 @@ public SnackbarPresenter()

protected virtual void OnUnloaded()
{
if (CancellationTokenSource.IsCancellationRequested)
{
return;
}

ImmediatelyHideCurrent();
ResetCancellationTokenSource();
}

private void ImmediatelyHideCurrent()
{
if (Content is null)
{
return;
}

CancellationTokenSource.Cancel();
CancellationTokenSource.Dispose();
ImmediatelyHidSnackbar(Content);
}

[System.Diagnostics.CodeAnalysis.SuppressMessage(
"WpfAnalyzers.DependencyProperty",
"WPF0041:Set mutable dependency properties using SetCurrentValue",
Justification = "SetCurrentValue(ContentProperty, ...) will not work"
)]
private void ImmediatelyHidSnackbar(Snackbar snackbar)
{
snackbar.SetCurrentValue(Snackbar.IsShownProperty, false);
Content = null;
}

protected void ResetCancellationTokenSource()
Expand Down Expand Up @@ -120,4 +147,14 @@ private async Task HidSnackbar(Snackbar snackbar)

Content = null;
}

~SnackbarPresenter()
{
if (!CancellationTokenSource.IsCancellationRequested)
{
CancellationTokenSource.Cancel();
}

CancellationTokenSource.Dispose();
}
}