Candidate for fixing Issue #111

Dirkster99 · Feb 3, 2020 · 64b1079 · 64b1079
1 parent 897e2ea
commit 64b1079
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/source/Components/AvalonDock/Layout/LayoutRoot.cs b/source/Components/AvalonDock/Layout/LayoutRoot.cs
@@ -677,8 +677,9 @@ public void ReadXml(XmlReader reader)
 				this.Hidden.Add((LayoutAnchorable)hiddenObject);
 			}
 
-			//Read the closing end element of LayoutRoot 
-			reader.ReadEndElement();
+			//Read the closing end element of LayoutRoot
+			if (reader.NodeType != XmlNodeType.None)
+				reader.ReadEndElement();
 		}
 
 		public void WriteXml(XmlWriter writer)
@@ -1038,7 +1039,8 @@ private List<object> ReadElementList(XmlReader reader, bool isFloatingWindow)
 				}
 			}
 
-			reader.ReadEndElement();
+			if (reader.NodeType != XmlNodeType.None)
+				reader.ReadEndElement();
 
 			return resultList;
 		}
@@ -1051,9 +1053,10 @@ private object ReadElement(XmlReader reader)
 			}
 
 			if (reader.NodeType == XmlNodeType.EndElement)
-			{
 				return null;
-			}
+
+			if (reader.NodeType == XmlNodeType.None)
+				return null;
 
 			XmlSerializer serializer;
 			switch (reader.LocalName)

diff --git a/source/MLibTest/MLibTest/Demos/LayoutInitializer.cs b/source/MLibTest/MLibTest/Demos/LayoutInitializer.cs
@@ -21,7 +21,7 @@ public bool BeforeInsertAnchorable(LayoutRoot layout,
 			if (toolsPane != null)
 			{
 				// do not allow this as Tabbed Document
-				anchorableToShow.CanDockAsTabbedDocument = false;
+				//anchorableToShow.CanDockAsTabbedDocument = false;
 				toolsPane.Children.Add(anchorableToShow);
 				return true;
 			}