From 12a947171a7087825d369cc15364ec3ff05dbaf3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Gerd=20M=C3=B6llmann?= Date: Sat, 9 Nov 2024 08:26:06 +0100 Subject: [PATCH] Don't copy from non-enabled current glyphs (bug#74274) * src/dispnew.c (prepare_desired_root_row): Check if current row is enabled. (cherry picked from commit 8fa26765c0dcedcadf884195189e337cb9778cb8) --- src/dispnew.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/dispnew.c b/src/dispnew.c index b202d667611..15fbf983b4b 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -3517,9 +3517,12 @@ prepare_desired_root_row (struct frame *root, int y) if (!root_row->enabled_p) { struct glyph_row *from = MATRIX_ROW (root->current_matrix, y); - memcpy (root_row->glyphs[0], from->glyphs[0], - root->current_matrix->matrix_w * sizeof (struct glyph)); - root_row->enabled_p = true; + if (from->enabled_p) + { + memcpy (root_row->glyphs[0], from->glyphs[0], + root->current_matrix->matrix_w * sizeof (struct glyph)); + root_row->enabled_p = true; + } } return root_row; } -- 2.39.5