work around menu close sometimes not firing

Author: SimonCropp

src/DiffEngineTray/MenuBuilder.cs

@@ -6,23 +6,20 @@
 
 static class MenuBuilder
 {
-    static List<ToolStripItem>? itemsToCleanup;
-
     public static ContextMenuStrip Build(Action exit, Action launchOptions, Tracker tracker)
     {
         var menu = new ContextMenuStrip();
         var items = menu.Items;
         menu.Opening += delegate
         {
-            DisposePreviousItems();
+            DisposePreviousItems(items);
 
             foreach (var item in BuildTrackingMenuItems(tracker))
             {
                 items.Add(item);
             }
         };
         menu.Font = new Font(menu.Font.FontFamily, 10);
-        menu.Closed += delegate { CleanTransientMenus(items); };
         items.Add(new MenuButton("Exit", exit, Images.Exit));
         items.Add(new MenuButton("Options", launchOptions, Images.Options));
         items.Add(new MenuButton("Open logs", Logging.OpenDirectory, Images.Folder));
@@ -40,25 +37,15 @@ static List<ToolStripItem> NonDefaultMenus(ToolStripItemCollection items)
             .ToList();
     }
 
-    static void DisposePreviousItems()
+    static void DisposePreviousItems(ToolStripItemCollection items)
     {
-        if (itemsToCleanup == null)
-        {
-            return;
-        }
-
-        foreach (var item in itemsToCleanup)
+        foreach (var item in NonDefaultMenus(items))
         {
+            items.Remove(item);
             item.Dispose();
         }
     }
 
-    static void CleanTransientMenus(ToolStripItemCollection items)
-    {
-        itemsToCleanup = NonDefaultMenus(items);
-        items.RemoveRange(itemsToCleanup);
-    }
-
     static IEnumerable<ToolStripItem> BuildTrackingMenuItems(Tracker tracker)
     {
         if (!tracker.TrackingAny)

src/Directory.Build.props

@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <NoWarn>CS1591;CS0649</NoWarn>
-    <Version>6.1.1</Version>
+    <Version>6.1.2</Version>
     <AssemblyVersion>1.0.0</AssemblyVersion>
     <PackageTags>Testing, Snapshot, Diff, Compare</PackageTags>
     <Description>Launches diff tools based on file extensions. Designed to be consumed by snapshot testing libraries.</Description>