From 201949c3a207698d21ab94a7cfb84137ef4a0407 Mon Sep 17 00:00:00 2001
From: Adrian Robert <Adrian.B.Robert@gmail.com>
Date: Tue, 22 Sep 2009 19:49:50 +0000
Subject: [PATCH] (EmacsMenu-menuNeedsUpdate): Ignore if frame has been deleted
 (bug #4492).

---
 src/nsmenu.m | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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.
-- 
2.39.5