Ensure icon in context menu is not leaked (#709)

microsoft · Nov 13, 2019 · b490a72 · b490a72 · paulcam206 · Nov 13, 2019
1 parent 3c0b479
commit b490a72
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/modules/powerrename/dll/PowerRenameExt.cpp b/src/modules/powerrename/dll/PowerRenameExt.cpp
@@ -24,6 +24,7 @@ CPowerRenameMenu::CPowerRenameMenu()
 CPowerRenameMenu::~CPowerRenameMenu()
 {
     m_spdo = nullptr;
+    DeleteObject(m_hbmpIcon);
     DllRelease();
 }
 
@@ -83,7 +84,11 @@ HRESULT CPowerRenameMenu::QueryContextMenu(HMENU hMenu, UINT index, UINT uIDFirs
             if (hIcon)
             {
                 mii.fMask |= MIIM_BITMAP;
-                mii.hbmpItem = CreateBitmapFromIcon(hIcon);
+                if (m_hbmpIcon == NULL)
+                {
+                    m_hbmpIcon = CreateBitmapFromIcon(hIcon);
+                }
+                mii.hbmpItem = m_hbmpIcon;
                 DestroyIcon(hIcon);
             }
         }

diff --git a/src/modules/powerrename/dll/PowerRenameExt.h b/src/modules/powerrename/dll/PowerRenameExt.h
@@ -56,6 +56,7 @@ class CPowerRenameMenu :
     ~CPowerRenameMenu();
 
     long m_refCount = 1;
+    HBITMAP m_hbmpIcon = NULL;
     CComPtr<IDataObject> m_spdo;
 };