diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2013-12-13 17:34:05 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2013-12-13 17:34:05 +0400 |
| commit | b6c888cc7afed65f24c023b8e90b73649f438e14 (patch) | |
| tree | d2a660c8a8c285462e318a767004e7480377090d /src/font.c | |
| parent | 84c73ba09921f0918d98a5f5784d35d2db9a7577 (diff) | |
| download | emacs-b6c888cc7afed65f24c023b8e90b73649f438e14.tar.gz | |
* font.c (font_close_object): Check for live frame (Bug#16128).
Diffstat (limited to 'src/font.c')
| -rw-r--r-- | src/font.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/font.c b/src/font.c index d0a10332028..9f284440143 100644 --- a/src/font.c +++ b/src/font.c @@ -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 } |