1 files changed, 7 insertions, 6 deletions

diff --git a/src/alloc.c b/src/alloc.c
index 9304e4e42bb..666f77bfce1 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -7055,6 +7055,13 @@ mark_frame (struct Lisp_Vector *ptr)
   for (tem = f->conversion.actions; tem; tem = tem->next)
     mark_object (tem->data);
 #endif
+
+#ifdef HAVE_WINDOW_SYSTEM
+  /* Mark this frame's image cache, though it might be common to several
+     frames with the same font size.  */
+  if (FRAME_IMAGE_CACHE (f))
+    mark_image_cache (FRAME_IMAGE_CACHE (f));
+#endif /* HAVE_WINDOW_SYSTEM */
 }
 
 static void
@@ -7515,12 +7522,6 @@ mark_terminals (void)
   for (t = terminal_list; t; t = t->next_terminal)
     {
       eassert (t->name != NULL);
-#ifdef HAVE_WINDOW_SYSTEM
-      /* If a terminal object is reachable from a stacpro'ed object,
-         it might have been marked already.  Make sure the image cache
-         gets marked.  */
-      mark_image_cache (t->image_cache);
-#endif /* HAVE_WINDOW_SYSTEM */
       if (!vectorlike_marked_p (&t->header))
         mark_vectorlike (&t->header);
     }