Mercurial > emacs

diff src/xftfont.c @ 106290:8671036bedc4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Jan Djärv <jan.h.d@swipnet.se>
date Fri, 27 Nov 2009 17:27:04 +0000
parents 6804c4648fee
children 500878bee91d
line wrap: on
line diff
--- a/src/xftfont.c	Fri Nov 27 16:38:57 2009 +0000
+++ b/src/xftfont.c	Fri Nov 27 17:27:04 2009 +0000
@@ -668,7 +668,12 @@
 xftfont_end_for_frame (f)
      FRAME_PTR f;
 {
-  XftDraw *xft_draw = font_get_frame_data (f, &xftfont_driver);
+  XftDraw *xft_draw;
+
+  /* Don't do anything if display is dead */
+  if (FRAME_X_DISPLAY (f) == NULL) return 0;
+
+  xft_draw = font_get_frame_data (f, &xftfont_driver);
 
   if (xft_draw)
     {