Detach ContextMenuStrip from control when executing Dispose

dotnet · Oct 31, 2024 · c8e0d8e · c8e0d8e
1 parent 186979d
commit c8e0d8e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -216,4 +216,4 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
       <Sha>e4df2888e714255352a6afa2ec1246e70ac21a49</Sha>
     </Dependency>
   </ToolsetDependencies>
-</Dependencies>
+</Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -114,4 +114,4 @@
     <!-- Pin transitive dependency to avoid vulnerable 8.0.0 version. -->
     <SystemFormatsAsn1PackageVersion>8.0.1</SystemFormatsAsn1PackageVersion>
   </PropertyGroup>
-</Project>
+</Project>
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs
@@ -4694,9 +4694,13 @@ protected override void Dispose(bool disposing)
             }
         }
 
-        ContextMenuStrip = null;
+        // Unsubscribes from the Disposed event of the ContextMenuStrip.
+        if (ContextMenuStrip is not null)
+        {
+            ContextMenuStrip.Disposed -= DetachContextMenuStrip;
+        }
+
         ReflectParent = null;
-        ContextMenuStrip = null;
 
         if (disposing)
         {