summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJason Rumney <jasonr@gnu.org>2006-03-12 16:29:25 +0000
committerJason Rumney <jasonr@gnu.org>2006-03-12 16:29:25 +0000
commite7b14860d5e37f22e1ed3907cb2223367db45f8c (patch)
treebc1842f7f2bdcbfe6bac64193e7dc703493b5808 /src
parentab68b375c71ef86a7e90640e7f12a20185526cc1 (diff)
downloademacs-e7b14860d5e37f22e1ed3907cb2223367db45f8c.tar.gz
emacs-e7b14860d5e37f22e1ed3907cb2223367db45f8c.tar.bz2
emacs-e7b14860d5e37f22e1ed3907cb2223367db45f8c.zip
(Fx_popup_menu): Call w32_free_menu_strings when
finished with the menu.
Diffstat (limited to 'src')
-rw-r--r--src/w32menu.c8
1 files changed, 6 insertions, 2 deletions
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;