* frame.c (x_get_arg): Check if dpyinfo is non-NULL.

diff --git a/src/ChangeLog b/src/ChangeLog
index f661dbc213f575082e687ff759828da52c9ffbf7..f7bd242145f6229adbb0a84a77f779b66f3600be 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-27  Chong Yidong  <cyd@stupidchicken.com>
+
+       * frame.c (x_get_arg): Check if dpyinfo is non-NULL.
+
 2009-06-27  Glenn Morris  <rgm@gnu.org>
 
        * m/pmax.h: Restore file.

diff --git a/src/frame.c b/src/frame.c
index 10713826b507d60816cd87ef6a23716946bf7ab9..9e05b1b8456c5dbeb21e7199398ae976e0213369 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -4009,7 +4009,7 @@ x_get_arg (dpyinfo, alist, param, attribute, class, type)
      look in the X resources.  */
   if (EQ (tem, Qnil))
     {
-      if (attribute)
+      if (attribute && dpyinfo)
        {
          tem = display_x_get_resource (dpyinfo,
                                        build_string (attribute),