From 54e9501092ec8a87991fb3da5b1732c12b43c61e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Tue, 26 Mar 2013 16:34:45 +0100 Subject: [PATCH] * gtkutil.c (style_changed_cb): Check if frame is live and an X frame. Fixes: debbugs:14038 --- src/ChangeLog | 5 +++++ src/gtkutil.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index ce0455a4981..7a0c223bbe8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2013-03-26 Jan Djärv + + * gtkutil.c (style_changed_cb): Check if frame is live and an + X frame (Bug#14038). + 2013-03-26 Eli Zaretskii * w32.c (_PROCESS_MEMORY_COUNTERS_EX) [_WIN32_WINNT < 0x0500]: diff --git a/src/gtkutil.c b/src/gtkutil.c index 2bb4305e1d2..595a7427c21 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -1094,7 +1094,9 @@ style_changed_cb (GObject *go, FOR_EACH_FRAME (rest, frame) { FRAME_PTR f = XFRAME (frame); - if (FRAME_X_DISPLAY (f) == dpy) + if (FRAME_LIVE_P (f) + && FRAME_X_P (f) + && FRAME_X_DISPLAY (f) == dpy) { x_set_scroll_bar_default_width (f); xg_frame_set_char_size (f, FRAME_COLS (f), FRAME_LINES (f)); -- 2.39.5