From 3909d7e92f71ffe5e86e081ed831f1808701d82d Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 23 Mar 2026 08:58:39 +0000
Subject: [PATCH] Use window options for cursor-style to avoid crash when no
 pane, from Arden Packeer in GitHub issue 4942.

---
 input.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/input.c b/input.c
index 6c1a66e4..24467144 100644
--- a/input.c
+++ b/input.c
@@ -1613,7 +1613,7 @@ input_csi_dispatch(struct input_ctx *ictx)
 				if (ictx->wp != NULL)
 					oo = ictx->wp->options;
 				else
-					oo = global_options;
+					oo = global_w_options;
 				p = options_get_number(oo, "cursor-style");
 
 				/* blink for 1,3,5; steady for 0,2,4,6 */
@@ -2503,7 +2503,7 @@ input_handle_decrqss(struct input_ctx *ictx)
 		if (wp != NULL)
 			oo = wp->options;
 		else
-			oo = global_options;
+			oo = global_w_options;
 		opt_ps = options_get_number(oo, "cursor-style");
 
 		/* Sanity clamp: valid Ps are 0..6 per DECSCUSR. */
@@ -2538,8 +2538,9 @@ input_dcs_dispatch(struct input_ctx *ictx)
 	long long		 allow_passthrough = 0;
 
 	if (wp == NULL)
-		return (0);
-	oo = wp->options;
+		oo = global_w_options;
+	else
+		oo = wp->options;
 
 	if (ictx->flags & INPUT_DISCARD) {
 		log_debug("%s: %zu bytes (discard)", __func__, len);