2 files changed, 7 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 910c24e8063..1b0e6bb0452 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2000-06-09  Ken Raeburn  <raeburn@gnu.org>
+
+        * xterm.c (x_connection_closed): If dpyinfo is NULL, don't try to
+        access the data it doesn't point to.
+
 2000-06-08  Gerd Moellmann  <gerd@gnu.org>
 
         * xterm.c (XTread_socket) <FocusIn>: Queue a FOCUS_IN_EVENT which
diff --git a/src/xterm.c b/src/xterm.c
index eea9b76d191..c2cc57a319d 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10799,7 +10799,8 @@ x_connection_closed (display, error_message)
 #endif
 #endif
 
-  dpyinfo->display = 0;
+  if (dpyinfo)
+    dpyinfo->display = 0;
 
   /* First delete frames whose mini-buffers are on frames
      that are on the dead display.  */