From fa016aa3a858dc201f3a852a0097a7488ef2ce7e Mon Sep 17 00:00:00 2001
From: David Quintana <gigaherz@gmail.com>
Date: Fri, 24 Oct 2014 16:03:58 +0000
Subject: [PATCH] [RSHELL] * Fix HMENU leak in menu-based shell popups (and
 menubar).

svn path=/branches/shell-experiments/; revision=64960
---
 base/shell/rshell/CMenuBand.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/base/shell/rshell/CMenuBand.cpp b/base/shell/rshell/CMenuBand.cpp
index 344fdadd97a..fbb9ba4095f 100644
--- a/base/shell/rshell/CMenuBand.cpp
+++ b/base/shell/rshell/CMenuBand.cpp
@@ -72,6 +72,9 @@ CMenuBand::~CMenuBand()
 
     if (m_SFToolbar)
         delete m_SFToolbar;
+
+    if (m_hmenu)
+        DestroyMenu(m_hmenu);
 }
 
 HRESULT STDMETHODCALLTYPE  CMenuBand::Initialize(
@@ -129,6 +132,12 @@ HRESULT STDMETHODCALLTYPE  CMenuBand::SetMenu(
 
     BOOL created = FALSE;
 
+    if (m_hmenu)
+    {
+        DestroyMenu(m_hmenu);
+        m_hmenu = NULL;
+    }
+
     if (m_staticToolbar == NULL)
     {
         m_staticToolbar = new CMenuStaticToolbar(this);