Fix #3381: Make sure that selectedNode is still selected when focus is deferred in IsActive property changed handler.

siegfriedpammer · siegfriedpammer · commit a592169bb358 · 2025-01-29T19:42:16.000+01:00
diff --git a/ILSpy/AssemblyTree/AssemblyListPane.xaml.cs b/ILSpy/AssemblyTree/AssemblyListPane.xaml.cs
@@ -71,7 +71,10 @@ protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)
 				if (SelectedItem is SharpTreeNode selectedItem)
 				{
 					// defer focusing, so it does not interfere with selection via mouse click
-					this.BeginInvoke(() => FocusNode(selectedItem));
+					this.BeginInvoke(() => {
+						if (this.SelectedItem == selectedItem)
+							FocusNode(selectedItem);
+					});
 				}
 				else
 				{

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,10 @@ protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)`
`71`	`71`	`if (SelectedItem is SharpTreeNode selectedItem)`
`72`	`72`	`{`
`73`	`73`	`// defer focusing, so it does not interfere with selection via mouse click`
`74`		`- this.BeginInvoke(() => FocusNode(selectedItem));`
	`74`	`+ this.BeginInvoke(() => {`
	`75`	`+ if (this.SelectedItem == selectedItem)`
	`76`	`+ FocusNode(selectedItem);`
	`77`	`+ });`
`75`	`78`	`}`
`76`	`79`	`else`
`77`	`80`	`{`