From: Richard M. Stallman <rms@gnu.org>
Date: Sat, 10 Oct 1998 15:07:08 +0000 (+0000)
Subject: (check_x_display_info): Don't use selected_frame if it is dead.
X-Git-Tag: emacs-20.4~1538
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0ec56a80564f2053e28e0da56e60ea50f50e5241;p=emacs.git

(check_x_display_info): Don't use selected_frame if it is dead.
---

diff --git a/src/xfns.c b/src/xfns.c
index 48bda27702a..f6395dc0fb4 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -264,7 +264,8 @@ check_x_display_info (frame)
 {
   if (NILP (frame))
     {
-      if (FRAME_X_P (selected_frame))
+      if (FRAME_X_P (selected_frame)
+	  && FRAME_LIVE_P (selected_frame))
 	return FRAME_X_DISPLAY_INFO (selected_frame);
       else if (x_display_list != 0)
 	return x_display_list;