From ece2d4ed181649ebdac464f8149527a9ce75d4ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Dj=C3=A4rv?= <jan.h.d@swipnet.se>
Date: Fri, 27 Nov 2009 17:27:04 +0000
Subject: Don't crash if an X terminal is deleted with force == t.

* xftfont.c (xftfont_end_for_frame): Just return if dpyinfo->display
is NULL.

* xterm.c (x_delete_terminal): Set dpyinfo->display to NULL.

* frame.c (frame_make_pointer_invisible)
(frame_make_pointer_visible): Just return if there isn't any selected
frame.
---
 src/xterm.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/xterm.c')

diff --git a/src/xterm.c b/src/xterm.c
index 94093bd3848..9feb6c8966a 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10747,6 +10747,8 @@ x_delete_terminal (struct terminal *terminal)
 #endif /* ! USE_GTK */
     }
 
+  /* Mark as dead. */
+  dpyinfo->display = NULL;
   x_delete_display (dpyinfo);
   UNBLOCK_INPUT;
 }
-- 
cgit v1.2.1