summaryrefslogtreecommitdiff
path: root/src/xterm.c
diff options
context:
space:
mode:
authorJan Djärv <jan.h.d@swipnet.se>2009-11-27 17:27:04 +0000
committerJan Djärv <jan.h.d@swipnet.se>2009-11-27 17:27:04 +0000
commitece2d4ed181649ebdac464f8149527a9ce75d4ad (patch)
tree431a9fb9ebf71d7ee10aab9ea8a801304ca2cd51 /src/xterm.c
parent59ffcfc485671bea907b4b8353bd0b8f5e75dc41 (diff)
downloademacs-ece2d4ed181649ebdac464f8149527a9ce75d4ad.tar.gz
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.
Diffstat (limited to 'src/xterm.c')
-rw-r--r--src/xterm.c2
1 files changed, 2 insertions, 0 deletions
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;
}