comparison src/xftfont.c @ 106290:8671036bedc4

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
comparison
equal deleted inserted replaced
106289:c3a33227027b 106290:8671036bedc4
666 666
667 static int 667 static int
668 xftfont_end_for_frame (f) 668 xftfont_end_for_frame (f)
669 FRAME_PTR f; 669 FRAME_PTR f;
670 { 670 {
671 XftDraw *xft_draw = font_get_frame_data (f, &xftfont_driver); 671 XftDraw *xft_draw;
672
673 /* Don't do anything if display is dead */
674 if (FRAME_X_DISPLAY (f) == NULL) return 0;
675
676 xft_draw = font_get_frame_data (f, &xftfont_driver);
672 677
673 if (xft_draw) 678 if (xft_draw)
674 { 679 {
675 BLOCK_INPUT; 680 BLOCK_INPUT;
676 XftDrawDestroy (xft_draw); 681 XftDrawDestroy (xft_draw);