From 713d5522fe145595757e48aac486cb64804df35c Mon Sep 17 00:00:00 2001 From: Ben Date: Thu, 31 Aug 2023 14:02:07 +0200 Subject: [PATCH] Added additional NullChecks in OnClosed LayoutAnchorableFloatingWindowControl.cs https://github.com/Dirkster99/AvalonDock/issues/437 --- .../Controls/LayoutAnchorableFloatingWindowControl.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/Components/AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs b/source/Components/AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs index b9d6e0a4..6f453c04 100644 --- a/source/Components/AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs +++ b/source/Components/AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs @@ -208,11 +208,11 @@ protected override void OnInitialized(EventArgs e) /// protected override void OnClosed(EventArgs e) { - var root = Model.Root; + var root = Model?.Root; if (root != null) { if (root is LayoutRoot layoutRoot) layoutRoot.Updated -= OnRootUpdated; - root.Manager.RemoveFloatingWindow(this); + root.Manager?.RemoveFloatingWindow(this); root.CollectGarbage(); } if (_overlayWindow != null)