mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-03 11:33:37 +00:00
Code Issues Releases Activity

* font.c (font_close_object): Check for live frame (Bug#16128).

Browse Source
This commit is contained in:
Dmitry Antipov 2013-12-13 17:34:05 +04:00
parent 84c73ba099
commit b6c888cc7a
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@ -1,3 +1,7 @@
2013-12-13 Dmitry Antipov <dmantipov@yandex.ru>
* font.c (font_close_object): Check for live frame (Bug#16128).
2013-12-13 Paul Eggert <eggert@cs.ucla.edu>
* gnutls.c, gnutls.h (emacs_gnutls_record_check_pending):

8
src/font.c
View File

@ -2898,8 +2898,12 @@ font_close_object (Lisp_Object font_object)
font->driver->close (font);
#ifdef HAVE_WINDOW_SYSTEM
eassert (font->frame);
eassert (FRAME_DISPLAY_INFO (font->frame)->n_fonts);
FRAME_DISPLAY_INFO (font->frame)->n_fonts--;
/* If the frame is gone, we can't do anything (Bug#16128). */
if (FRAME_LIVE_P (font->frame))
{
eassert (FRAME_DISPLAY_INFO (font->frame)->n_fonts);
FRAME_DISPLAY_INFO (font->frame)->n_fonts--;
}
#endif
}