Merge pull request #314 from siegfriedpammer/ilspy-issue-2577

Fix NavigatorWindow not working if there is only one document
Dirkster99 · Dec 16, 2021 · f58ae9a · f58ae9a
2 parents 9ffd291 + 2c66156
commit f58ae9a
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/source/Components/AvalonDock/Controls/NavigatorWindow.cs b/source/Components/AvalonDock/Controls/NavigatorWindow.cs
@@ -58,15 +58,19 @@ internal NavigatorWindow(DockingManager manager)
 			SetAnchorables(_manager.Layout.Descendents().OfType<LayoutAnchorable>().Where(a => a.IsVisible).Select(d => (LayoutAnchorableItem)_manager.GetLayoutItemFromModel(d)).ToArray());
 			SetDocuments(_manager.Layout.Descendents().OfType<LayoutDocument>().OrderByDescending(d => d.LastActivationTimeStamp.GetValueOrDefault()).Select(d => (LayoutDocumentItem)_manager.GetLayoutItemFromModel(d)).ToArray());
 			_internalSetSelectedDocument = false;
-			if (Documents.Length > 1)
+			if (Documents.Length > 0)
 			{
-				InternalSetSelectedDocument(Documents[1]);
+				InternalSetSelectedDocument(Documents[0]);
 				_isSelectingDocument = true;
 			}
-			else if (Anchorables.Count() > 1)
+			else
 			{
-				InternalSetSelectedAnchorable(Anchorables.ToArray()[1]);
-				_isSelectingDocument = false;
+				var anchorable = Anchorables.FirstOrDefault();
+				if (anchorable != null)
+				{
+					InternalSetSelectedAnchorable(anchorable);
+					_isSelectingDocument = false;
+				}
 			}
 			DataContext = this;
 			Loaded += OnLoaded;