From: Daniel Martín <mardani29@yahoo.es>
Date: Thu, 13 Jul 2023 08:47:35 +0000 (+0200)
Subject: Avoid crashes on macOS with context menus
X-Git-Tag: emacs-29.1.90~130
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1458daf316475e8c07102e4886664c4fd6790432;p=emacs.git

Avoid crashes on macOS with context menus

* src/nsmenu.m ([EmacsMenu menuNeedsUpdate:]): Avoid crashes with
context menus.  (Bug#63495)
---

diff --git a/src/nsmenu.m b/src/nsmenu.m
index 2c1f575bdf2..4a86864176d 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -477,6 +477,14 @@ set_frame_menubar (struct frame *f, bool deep_p)
    call to ns_update_menubar.  */
 - (void)menuNeedsUpdate: (NSMenu *)menu
 {
+
+  /* The context menu is built and then displayed, as opposed to the
+     top-menu, which is partially built and then updated and filled in
+     when it's time to display it.  Therefore, we don't call
+     ns_update_menubar if a context menu is active. */
+  if (context_menu_value != 0)
+    return;
+
 #ifdef NS_IMPL_GNUSTEP
   static int inside = 0;
 #endif