From: Jason Rumney <jasonr@gnu.org>
Date: Sun, 12 Mar 2006 16:29:25 +0000 (+0000)
Subject: (Fx_popup_menu): Call w32_free_menu_strings when
X-Git-Tag: emacs-pretest-22.0.90~3638
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e7b14860d5e37f22e1ed3907cb2223367db45f8c;p=emacs.git

(Fx_popup_menu): Call w32_free_menu_strings when
finished with the menu.
---

diff --git a/src/w32menu.c b/src/w32menu.c
index 57db01ac9e9..389e6c5b856 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -819,8 +819,10 @@ cached information about equivalent key sequences.  */)
     }
 
 #ifdef HAVE_MENUS
-  /* If resources from a previous popup menu exist yet, does nothing
-     until the `menu_free_timer' has freed them (see w32fns.c).
+  /* If resources from a previous popup menu still exist, does nothing
+     until the `menu_free_timer' has freed them (see w32fns.c). This
+     can occur if you press ESC or click outside a menu without selecting
+     a menu item.
   */
   if (current_popup_menu)
     {
@@ -837,6 +839,8 @@ cached information about equivalent key sequences.  */)
   UNBLOCK_INPUT;
 
   discard_menu_items ();
+  w32_free_menu_strings (FRAME_W32_WINDOW (f));
+
 #endif /* HAVE_MENUS */
 
   UNGCPRO;