- Some improvements to minimize the frequency of #22

oleg-shilo · Feb 4, 2023 · 4a472ca · 4a472ca
1 parent 5342cbe
commit 4a472ca
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/shell-x/Program.cs b/shell-x/Program.cs
@@ -254,8 +254,8 @@ protected override ContextMenuStrip CreateMenu()
         var menu = new ContextMenuStrip();
         menu.Items.AddRange(items);
 
-        // DisposeLastMenu();
-        // lastOpenedMenu = menu;
+        DisposeLastMenu();
+        lastOpenedMenu = menu;
 
         return menu;
     }
@@ -276,8 +276,8 @@ void DisposeLastMenu()
                 }
                 catch { }
             }
-            // lastOpenedMenu.Close();
-            // lastOpenedMenu.Dispose();
+            lastOpenedMenu.Close();
+            lastOpenedMenu.Dispose();
         }
     }
 
@@ -329,7 +329,7 @@ internal static ToolStripItem[] BuildMenuFrom(string configDir, string invokeArg
                     try
                     {
                         var size = parentMenu.ContentRectangle.Height.ToStandardIconSize();
-                        parentMenu.Image = parentMenu.Image?.Resize(size, size, dispose: true);
+                        parentMenu.Image = parentMenu.Image?.Resize(size, size);
                     }
                     catch { }
 
@@ -358,7 +358,7 @@ internal static ToolStripItem[] BuildMenuFrom(string configDir, string invokeArg
                         {
                             var size = menu.ContentRectangle.Height.ToStandardIconSize();
 
-                            menu.Image = menu.Image?.Resize(size, size, dispose: true);
+                            menu.Image = menu.Image?.Resize(size, size);
                         }
                         catch { }
 
@@ -539,7 +539,7 @@ public static Image ReadImage(this string file)
         }
     }
 
-    public static Bitmap Resize(this Image image, int width, int height, bool dispose)
+    public static Bitmap Resize(this Image image, int width, int height)
     {
         var destRect = new Rectangle(0, 0, width, height);
         var destImage = new Bitmap(width, height);
@@ -561,8 +561,6 @@ public static Bitmap Resize(this Image image, int width, int height, bool dispos
             }
         }
 
-        if (dispose)
-            image.Dispose();
         return destImage;
     }
 }