From 77ce0a837d4439cec281747bb34cddccfac0b554 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 3 Mar 2026 12:24:18 +0000
Subject: [PATCH] Check window is not NULL, from Chema Gonzalez in GitHub issue
 4908.

---
 server-fn.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/server-fn.c b/server-fn.c
index fc20fce6..c36dc74f 100644
--- a/server-fn.c
+++ b/server-fn.c
@@ -97,7 +97,9 @@ server_redraw_window(struct window *w)
 	struct client	*c;
 
 	TAILQ_FOREACH(c, &clients, entry) {
-		if (c->session != NULL && c->session->curw->window == w)
+		if (c->session != NULL &&
+		    c->session->curw != NULL &&
+		    c->session->curw->window == w)
 			server_redraw_client(c);
 	}
 }
@@ -108,7 +110,9 @@ server_redraw_window_borders(struct window *w)
 	struct client	*c;
 
 	TAILQ_FOREACH(c, &clients, entry) {
-		if (c->session != NULL && c->session->curw->window == w)
+		if (c->session != NULL &&
+		    c->session->curw != NULL &&
+		    c->session->curw->window == w)
 			c->flags |= CLIENT_REDRAWBORDERS;
 	}
 }