Merge pull request #241 from Khaos66/master

Fixed NullReferenceException when Root is null
Dirkster99 · Feb 22, 2021 · 2705d5a · 2705d5a
2 parents 30c9cec + f990b60
commit 2705d5a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/source/Components/AvalonDock/Controls/AnchorablePaneTitle.cs b/source/Components/AvalonDock/Controls/AnchorablePaneTitle.cs
@@ -63,7 +63,7 @@ public LayoutAnchorable Model
 		protected virtual void OnModelChanged(DependencyPropertyChangedEventArgs e)
 		{
 			if (Model != null)
-				SetLayoutItem(Model.Root.Manager.GetLayoutItemFromModel(Model));
+				SetLayoutItem(Model?.Root?.Manager?.GetLayoutItemFromModel(Model));
 			else
 				SetLayoutItem(null);
 		}

diff --git a/source/Components/AvalonDock/Controls/LayoutAnchorableControl.cs b/source/Components/AvalonDock/Controls/LayoutAnchorableControl.cs
@@ -67,7 +67,7 @@ protected virtual void OnModelChanged(DependencyPropertyChangedEventArgs e)
 			if (Model != null)
 			{
 				Model.PropertyChanged += Model_PropertyChanged;
-				SetLayoutItem(Model.Root.Manager.GetLayoutItemFromModel(Model));
+				SetLayoutItem(Model?.Root?.Manager?.GetLayoutItemFromModel(Model));
 			}
 			else
 				SetLayoutItem(null);

diff --git a/source/Components/AvalonDock/Controls/LayoutDocumentControl.cs b/source/Components/AvalonDock/Controls/LayoutDocumentControl.cs
@@ -63,7 +63,7 @@ protected virtual void OnModelChanged(DependencyPropertyChangedEventArgs e)
 			if (Model != null)
 			{
 				Model.PropertyChanged += Model_PropertyChanged;
-				SetLayoutItem(Model.Root.Manager.GetLayoutItemFromModel(Model));
+				SetLayoutItem(Model?.Root?.Manager?.GetLayoutItemFromModel(Model));
 			}
 			else
 				SetLayoutItem(null);