From a150a8e807ce754b1008ecc5c799097e04080446 Mon Sep 17 00:00:00 2001 From: "LAPTOP-SB0RO65G\\samra" Date: Mon, 26 Aug 2024 21:50:47 +0200 Subject: [PATCH] Fix #3221: bug with importing assembly files --- ICSharpCode.ILSpyX/TreeView/SharpTreeNodeCollection.cs | 5 ++++- ILSpy/Controls/TreeView/SharpTreeView.cs | 8 ++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ICSharpCode.ILSpyX/TreeView/SharpTreeNodeCollection.cs b/ICSharpCode.ILSpyX/TreeView/SharpTreeNodeCollection.cs index 8b69a9553..7932eef9c 100644 --- a/ICSharpCode.ILSpyX/TreeView/SharpTreeNodeCollection.cs +++ b/ICSharpCode.ILSpyX/TreeView/SharpTreeNodeCollection.cs @@ -73,7 +73,10 @@ namespace ICSharpCode.ILSpyX.TreeView public SharpTreeNode this[int index] { get { - return list[index]; + if (index >= 0) + return list[index]; + else + return null; } set { ThrowOnReentrancy(); diff --git a/ILSpy/Controls/TreeView/SharpTreeView.cs b/ILSpy/Controls/TreeView/SharpTreeView.cs index faa7cb2f0..ab86539bd 100644 --- a/ILSpy/Controls/TreeView/SharpTreeView.cs +++ b/ILSpy/Controls/TreeView/SharpTreeView.cs @@ -561,8 +561,12 @@ namespace ICSharpCode.ILSpy.Controls.TreeView { if (node.IsExpanded && node.Children.Count > 0) { - var firstChildItem = ItemContainerGenerator.ContainerFromItem(node.Children[0]) as SharpTreeViewItem; - TryAddDropTarget(result, firstChildItem, DropPlace.Before, e); + var nodeChild = node.Children[0]; + if (nodeChild != null) + { + var firstChildItem = ItemContainerGenerator.ContainerFromItem(node.Children[0]) as SharpTreeViewItem; + TryAddDropTarget(result, firstChildItem, DropPlace.Before, e); + } } else {