(EmacsMenu-menuNeedsUpdate): Ignore if frame has been deleted (bug #4492).

201949c3 · Adrian Robert · 4eb34cc7 · 201949c3
Commit 201949c3 authored Sep 22, 2009 by Adrian Robert
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

src/nsmenu.m src/nsmenu.m +4 -1

No files found.
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -568,7 +568,10 @@ - (void)setFrame: (struct frame *)f
   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.