1 files changed, 2 insertions, 1 deletions

diff --git a/src/alloc.c b/src/alloc.c
index f04f3c05134..d824a6a491e 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -6020,7 +6020,8 @@ mark_object (Lisp_Object arg)
               /* Mark glyphs for leaf windows.  Marking window
                  matrices is sufficient because frame matrices
                  use the same glyph memory.  */
-              if (NILP (w->hchild) && NILP (w->vchild) && w->current_matrix)
+              if (NILP (WVAR (w, hchild)) && NILP (WVAR (w, vchild))
+                  && w->current_matrix)
                 {
                   mark_glyph_matrix (w->current_matrix);
                   mark_glyph_matrix (w->desired_matrix);