Commit b6c888cc authored by Dmitry Antipov's avatar Dmitry Antipov
Browse files

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

parent 84c73ba0
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):
......
......@@ -2898,8 +2898,12 @@ font_close_object (Lisp_Object font_object)
font->driver->close (font);
#ifdef HAVE_WINDOW_SYSTEM
eassert (font->frame);
/* 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
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment