diff --git a/src/DialogServiceViews.cs b/src/DialogServiceViews.cs index 25035776..24234ff1 100644 --- a/src/DialogServiceViews.cs +++ b/src/DialogServiceViews.cs @@ -124,8 +124,6 @@ internal static void Register(IView view) // only register for the event once, thus the un-registration of any prior // registrations. owner.Closed -= OwnerClosed; - owner.Closing -= OwnerClosing; - owner.Closing += OwnerClosing; owner.Closed += OwnerClosed; Logger.Write($"Register view {view.Id}"); @@ -184,25 +182,6 @@ private static void LateRegister(object sender, RoutedEventArgs e) } } - private static void OwnerClosing(object? sender, CancelEventArgs e) - { - if (sender is Window owner) - { - var ownerThread = owner.Dispatcher.Thread.ManagedThreadId; - // Find views acting within closed window - IView[] windowViews = Views - .Where(view => ReferenceEquals(view.GetOwner(), owner)) - .ToArray(); - - // Unregister Views in window - foreach (IView windowView in windowViews) - { - Logger.Write($"Window containing view {windowView.Id} closed"); - Unregister(windowView); - } - } - } - /// /// Handles owner window closed. All views acting within the closed window should be /// unregistered.