* gtkutil.c (style_changed_cb): Check if frame is live and an

X frame.

Fixes: debbugs:14038

diff --git a/src/ChangeLog b/src/ChangeLog
index ce0455a49818996779434620a4620d66529fb8da..7a0c223bbe81a65b7d612bf70ed80b1571973761 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-26  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * gtkutil.c (style_changed_cb): Check if frame is live and an
+       X frame (Bug#14038).
+
 2013-03-26  Eli Zaretskii  <eliz@gnu.org>
 
        * w32.c (_PROCESS_MEMORY_COUNTERS_EX) [_WIN32_WINNT < 0x0500]:

diff --git a/src/gtkutil.c b/src/gtkutil.c
index 2bb4305e1d26ab7471f0fe02270cb85d55c90f02..595a7427c21d3f5e7bba550e0d55578d2d40bff3 100644 (file)
--- 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));