From 8191c587378b0bb6f9f6818b1d721cea56fe08ff Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 14 Sep 2023 13:01:35 +0000
Subject: Reset combine flag only if text is actually processed.

---
 screen-write.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'screen-write.c')

diff --git a/screen-write.c b/screen-write.c
index f81fef04..1514204d 100644
--- a/screen-write.c
+++ b/screen-write.c
@@ -1742,6 +1742,7 @@ screen_write_collect_end(struct screen_write_ctx *ctx)
 
 	if (ci->used == 0)
 		return;
+	ctx->flags &= ~SCREEN_WRITE_COMBINE;
 
 	before = screen_write_collect_trim(ctx, s->cy, s->cx, ci->used,
 	    &wrapped);
@@ -1792,8 +1793,6 @@ screen_write_collect_add(struct screen_write_ctx *ctx,
 	u_int				 sx = screen_size_x(s);
 	int				 collect;
 
-	ctx->flags &= ~SCREEN_WRITE_COMBINE;
-
 	/*
 	 * Don't need to check that the attributes and whatnot are still the
 	 * same - input_parse will end the collection when anything that isn't
@@ -1873,7 +1872,7 @@ screen_write_cell(struct screen_write_ctx *ctx, const struct grid_cell *gc)
 		screen_write_collect_flush(ctx, 0, __func__);
 		gc = screen_write_combine(ctx, combine, &xx, &cx);
 		if (gc != NULL) {
-			cy = s->cy;
+			cx = s->cx; cy = s->cy;
 			screen_write_set_cursor(ctx, xx, s->cy);
 			screen_write_initctx(ctx, &ttyctx, 0);
 			ttyctx.cell = gc;
-- 
cgit v1.2.3