emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

feature/pgtk 0b69b73 085/100: Fix crash when child frame updates toolbar


From: Yuuki Harano
Subject: feature/pgtk 0b69b73 085/100: Fix crash when child frame updates toolbar
Date: Tue, 24 Nov 2020 08:02:43 -0500 (EST)

branch: feature/pgtk
commit 0b69b73baa1e6fb2380e86aa5fab89d5f3a5b061
Author: Yuuki Harano <masm+github@masm11.me>
Commit: Jeff Walsh <jeff.walsh@drtusers-MacBook-Pro.local>

    Fix crash when child frame updates toolbar
    
    * src/gtkutil.c (update_frame_tool_bar): Do nothing when child frame.
---
 src/gtkutil.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/gtkutil.c b/src/gtkutil.c
index 0f1a51f..56d4158 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))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]