Skip to content
Merged
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions DialogHost.Avalonia/DialogHost.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -788,8 +788,6 @@ public void RemoveDispose(DialogOverlayPopupHost host) {
}

private void RemoveHost(DialogOverlayPopupHost host) {
//NB: _dialogTaskCompletionSource is only set in the case where the dialog is shown with Show
host.DialogTaskCompletionSource.TrySetResult(host.Session.CloseParameter);
host.IsOpen = false;
host.Content = null;

Expand All @@ -800,6 +798,8 @@ private void RemoveHost(DialogOverlayPopupHost host) {
if (_overlayPopupHosts.Count == 0) {
SetAndRaise(IsOpenProperty, ref _isOpen, false);
}

host.DialogTaskCompletionSource.TrySetResult(host.Session.CloseParameter);
}

private void ContentCoverGrid_OnPointerReleased(object sender, PointerReleasedEventArgs e) {
Expand Down