From 62f657845ef6229b2f1a78fbceb8f3b2a736227e Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Sat, 26 Aug 2023 20:57:44 +0100
Subject: =?UTF-8?q?Fix=20merge=20error,=20from=20Jakub=20=C5=81ukasiewicz.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 input.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'input.c')

diff --git a/input.c b/input.c
index 9174be61..b83e64b4 100644
--- a/input.c
+++ b/input.c
@@ -2259,6 +2259,7 @@ input_dcs_dispatch(struct input_ctx *ictx)
 	if (ictx->flags & INPUT_DISCARD) {
 		log_debug("%s: %zu bytes (discard)", __func__, len);
 		return (0);
+	}
 #ifdef ENABLE_SIXEL
 	if (buf[0] == 'q') {
 		si = sixel_parse(buf, len, w->xpixel, w->ypixel);
@@ -2266,7 +2267,6 @@ input_dcs_dispatch(struct input_ctx *ictx)
 			screen_write_sixelimage(sctx, si, ictx->cell.cell.bg);
 	}
 #endif
-	}
 
 	allow_passthrough = options_get_number(wp->options, "allow-passthrough");
 	if (!allow_passthrough)
-- 
cgit v1.2.3