Skip to content

Commit fb2561a

Browse files
authored
Fix #3402: System.NullReferenceException on right click on .NET 9 (#3403)
* Fix #3402: System.NullReferenceException on right click on .NET 9 * Add comments to clarify about used design pattern
1 parent 2c419f6 commit fb2561a

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

Directory.Packages.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
2828
<PackageVersion Include="Microsoft.NETCore.ILAsm" Version="9.0.0" />
2929
<PackageVersion Include="Microsoft.NETCore.ILDAsm" Version="9.0.0" />
30-
<PackageVersion Include="Microsoft.Sbom.Targets" Version="3.0.1" />
30+
<PackageVersion Include="Microsoft.Sbom.Targets" Version="3.0.1" />
3131
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
3232
<PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" />
3333
<PackageVersion Include="Mono.Cecil" Version="0.11.6" />
@@ -45,10 +45,10 @@
4545
<PackageVersion Include="System.Reflection.Metadata" Version="9.0.1" />
4646
<PackageVersion Include="System.Resources.Extensions" Version="9.0.1" />
4747
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.0" />
48-
<PackageVersion Include="TomsToolbox.Composition.MicrosoftExtensions" Version="2.21.0" />
49-
<PackageVersion Include="TomsToolbox.Wpf.Composition" Version="2.20.0" />
50-
<PackageVersion Include="TomsToolbox.Wpf.Composition.AttributedModel" Version="2.21.0" />
51-
<PackageVersion Include="TomsToolbox.Wpf.Styles" Version="2.21.0" />
48+
<PackageVersion Include="TomsToolbox.Composition.MicrosoftExtensions" Version="2.22.0" />
49+
<PackageVersion Include="TomsToolbox.Wpf.Composition" Version="2.22.0" />
50+
<PackageVersion Include="TomsToolbox.Wpf.Composition.AttributedModel" Version="2.22.0" />
51+
<PackageVersion Include="TomsToolbox.Wpf.Styles" Version="2.22.0" />
5252
<PackageVersion Include="coverlet.collector" Version="6.0.3" />
5353
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
5454
<PackageVersion Include="System.Private.Uri" Version="4.3.2" />

ILSpy/AssemblyTree/AssemblyTreeModel.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -767,6 +767,8 @@ private void TreeView_SelectionChanged()
767767
}
768768
else
769769
{
770+
// ensure that we are only connected once to the event, else we might get multiple notifications
771+
ContextMenuProvider.ContextMenuClosed -= ContextMenuClosed;
770772
ContextMenuProvider.ContextMenuClosed += ContextMenuClosed;
771773
}
772774
}

0 commit comments

Comments
 (0)