Merge pull request #1815 from hronlukas/master

Do not override owner in DialogService
PrismLibrary · Jun 5, 2019 · 428df87 · 428df87
2 parents 4551d9c + c4fa2f0
commit 428df87
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Source/Wpf/Prism.Wpf/Services/Dialogs/DialogService.cs b/Source/Wpf/Prism.Wpf/Services/Dialogs/DialogService.cs
@@ -113,8 +113,8 @@ void ConfigureDialogWindowProperties(IDialogWindow window, FrameworkElement dial
             window.Content = dialogContent;
             window.DataContext = viewModel; //we want the host window and the dialog to share the same data contex
 
-            //TODO: is there a better way to set the owner
-            window.Owner = Application.Current.Windows.OfType<Window>().FirstOrDefault(x => x.IsActive);
+            if (window.Owner == null)
+                window.Owner = Application.Current.Windows.OfType<Window>().FirstOrDefault(x => x.IsActive);
         }
     }
 }