diff options
| author | Yuuki Harano | 2020-09-29 18:38:41 +0900 |
|---|---|---|
| committer | Jeff Walsh | 2020-11-24 12:24:40 +1100 |
| commit | 0b69b73baa1e6fb2380e86aa5fab89d5f3a5b061 (patch) | |
| tree | aabbe47b93feaa23c7964341bfa5176dd3042454 /src | |
| parent | 7c8da336138eb799bcba8583cb18fc8b3cfe7347 (diff) | |
| download | emacs-0b69b73baa1e6fb2380e86aa5fab89d5f3a5b061.tar.gz emacs-0b69b73baa1e6fb2380e86aa5fab89d5f3a5b061.zip | |
Fix crash when child frame updates toolbar
* src/gtkutil.c (update_frame_tool_bar): Do nothing when child frame.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gtkutil.c | 5 |
1 files changed, 5 insertions, 0 deletions
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) | |||
| 5348 | if (! FRAME_GTK_WIDGET (f)) | 5348 | if (! FRAME_GTK_WIDGET (f)) |
| 5349 | return; | 5349 | return; |
| 5350 | 5350 | ||
| 5351 | #ifdef HAVE_PGTK | ||
| 5352 | if (! FRAME_GTK_OUTER_WIDGET (f)) | ||
| 5353 | return; | ||
| 5354 | #endif | ||
| 5355 | |||
| 5351 | block_input (); | 5356 | block_input (); |
| 5352 | 5357 | ||
| 5353 | if (RANGED_FIXNUMP (1, Vtool_bar_button_margin, INT_MAX)) | 5358 | if (RANGED_FIXNUMP (1, Vtool_bar_button_margin, INT_MAX)) |