Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into release/2.10
Browse files Browse the repository at this point in the history
# Conflicts:
#	DesktopUI2/DesktopUI2/ViewModels/StreamViewModel.cs
  • Loading branch information
teocomi committed Nov 21, 2022
2 parents 7f44193 + f6ea563 commit 0d0075c
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ public Task<TResult> ShowDialog<TResult>()
public void Close(object dialogResult)
{
_dialogResult = dialogResult;
Closed?.Invoke(this, null);
MainViewModel.Instance.DialogBody = null;
Closed?.Invoke(this, null);
}
}
}

0 comments on commit 0d0075c

Please sign in to comment.