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

1 files changed, 4 insertions, 1 deletions

diff --git a/src/nsmenu.m b/src/nsmenu.m
index 335e4c0e640..79644d28a80 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -568,7 +568,10 @@ name_is_separator (name)
    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.