From: Yuuki Harano <masm+github@masm11.me>
Date: Tue, 29 Sep 2020 09:38:41 +0000 (+0900)
Subject: Fix crash when child frame updates toolbar
X-Git-Tag: emacs-29.0.90~3775
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0b69b73baa1e6fb2380e86aa5fab89d5f3a5b061;p=emacs.git

Fix crash when child frame updates toolbar

* src/gtkutil.c (update_frame_tool_bar): Do nothing when child frame.
---

diff --git a/src/gtkutil.c b/src/gtkutil.c
index 0f1a51fbbbb..56d415887d0 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -5348,6 +5348,11 @@ update_frame_tool_bar (struct frame *f)
   if (! FRAME_GTK_WIDGET (f))
     return;
 
+#ifdef HAVE_PGTK
+  if (! FRAME_GTK_OUTER_WIDGET (f))
+    return;
+#endif
+
   block_input ();
 
   if (RANGED_FIXNUMP (1, Vtool_bar_button_margin, INT_MAX))