]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix crash when child frame updates toolbar
authorYuuki Harano <masm+github@masm11.me>
Tue, 29 Sep 2020 09:38:41 +0000 (18:38 +0900)
committerJeff Walsh <jeff.walsh@drtusers-MacBook-Pro.local>
Tue, 24 Nov 2020 01:24:40 +0000 (12:24 +1100)
* src/gtkutil.c (update_frame_tool_bar): Do nothing when child frame.

src/gtkutil.c

index 0f1a51fbbbb8b64315753c50f60654a2ceb54ba3..56d415887d0bdb211b0c3dd56475d06e6bad2bc4 100644 (file)
@@ -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))