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

4e23bedb · Chong Yidong · f5594f03 · 4e23bedb · 4e23bedb
Commit 4e23bedb authored Jun 27, 2009 by Chong Yidong
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

src/ChangeLog src/ChangeLog +2 -0

src/frame.c src/frame.c +1 -1

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
 2009-06-27  Chong Yidong  <cyd@stupidchicken.com>

+	* frame.c (x_get_arg): Check if dpyinfo is non-NULL.
+
 	* xdisp.c (mouse_face_from_buffer_pos): Fix detection of
 	truncation glyphs (Bug#3686).


--- 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),