# HG changeset patch
# User Adrian Robert <Adrian.B.Robert@gmail.com>
# Date 1253648990 0
# Node ID 23b427643575808a50326bf76b2946ab43bccc58
# Parent  4508a8827944b3e2a552f726c31e94fcf9303f0f
(EmacsMenu-menuNeedsUpdate): Ignore if frame has been deleted (bug #4492).

diff -r 4508a8827944 -r 23b427643575 src/nsmenu.m
--- a/src/nsmenu.m	Tue Sep 22 19:49:06 2009 +0000
+++ b/src/nsmenu.m	Tue Sep 22 19:49:50 2009 +0000
@@ -568,7 +568,10 @@
    to set_frame_menubar */
 - (void)menuNeedsUpdate: (NSMenu *)menu
 {
-  NSEvent *event = [[FRAME_NS_VIEW (frame) window] currentEvent];
+  NSEvent *event;
+  if (!FRAME_LIVE_P (frame))
+    return;
+  event = [[FRAME_NS_VIEW (frame) window] currentEvent];
   /* HACK: Cocoa/Carbon will request update on every keystroke
      via IsMenuKeyEvent -> CheckMenusForKeyEvent.  These are not needed
      since key equivalents are handled through emacs.