From 3f004b5de4cd169a53b7ef0d4ba4b94ead2ffdd9 Mon Sep 17 00:00:00 2001
From: Chong Yidong <cyd@stupidchicken.com>
Date: Sat, 27 Jun 2009 19:52:02 +0000
Subject: [PATCH] * frame.c (x_get_arg): Check if dpyinfo is non-NULL.

---
 src/ChangeLog | 4 ++++
 src/frame.c   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index f661dbc213f..f7bd242145f 100644
--- 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 10713826b50..9e05b1b8456 100644
--- 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),
-- 
2.39.2