Skip to content

Fix possible ObservableCollection re-entrance crash when trying to na… #3294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
siegfriedpammer merged 1 commit into from
Sep 28, 2024
Merged

Fix possible ObservableCollection re-entrance crash when trying to na… #3294

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions ILSpy/AssemblyTree/AssemblyTreeModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,14 +530,22 @@ internal void SelectNodes(IEnumerable<SharpTreeNode> nodes)
if (this.isNavigatingHistory)
{
SelectedItems.Clear();
SelectedItems.AddRange(nodesList);
foreach (var node in nodesList)
{
activeView.ScrollIntoView(node);
SelectedItems.Add(node);
}
}
else
{
// defer selection change, so it does not interfere with the focus of the tab page.
Dispatcher.BeginInvoke(() => {
SelectedItems.Clear();
SelectedItems.AddRange(nodesList);
foreach (var node in nodesList)
{
activeView.ScrollIntoView(node);
SelectedItems.Add(node);
}
});
}
}
Expand Down Expand Up @@ -691,6 +699,7 @@ public void LoadAssemblies(IEnumerable<string> fileNames, List<LoadedAssembly> l
if (node != null && focusNode)
{
lastNode = node;
activeView?.ScrollIntoView(node);
SelectedItems.Add(node);
}
}
Expand Down