Skip to content
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

Jump to bottom

(GH-3865) Fix InvalidOperationException when open a dialog over a child window #3866

Merged
merged 1 commit into from
Jun 23, 2020
Merged

(GH-3865) Fix InvalidOperationException when open a dialog over a child window #3866

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
4 changes: 2 additions & 2 deletions src/MahApps.Metro/Controls/Dialogs/DialogManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ private static void AddDialog(this MetroWindow window, BaseMetroDialog dialog)
window.StoreFocus();

// if there's already an active dialog, move to the background
var activeDialog = window.metroActiveDialogContainer.Children.Cast<UIElement>().SingleOrDefault();
var activeDialog = window.metroActiveDialogContainer.Children.OfType<BaseMetroDialog>().SingleOrDefault();
if (activeDialog != null)
{
window.metroActiveDialogContainer.Children.Remove(activeDialog);
Expand All @@ -520,7 +520,7 @@ private static void RemoveDialog(this MetroWindow window, BaseMetroDialog dialog
window.metroActiveDialogContainer.Children.Remove(dialog); //remove the dialog from the container

// if there's an inactive dialog, bring it to the front
var dlg = window.metroInactiveDialogContainer.Children.Cast<UIElement>().LastOrDefault();
var dlg = window.metroInactiveDialogContainer.Children.OfType<BaseMetroDialog>().LastOrDefault();
if (dlg != null)
{
window.metroInactiveDialogContainer.Children.Remove(dlg);
Expand Down