diff options
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 } |