===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window.c,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -r1.276 -r1.277
--- src/usr.bin/tmux/window.c	2021/08/27 17:15:57	1.276
+++ src/usr.bin/tmux/window.c	2021/10/07 07:52:13	1.277
@@ -1,4 +1,4 @@
-/* $OpenBSD: window.c,v 1.276 2021/08/27 17:15:57 nicm Exp $ */
+/* $OpenBSD: window.c,v 1.277 2021/10/07 07:52:13 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -1527,7 +1527,7 @@
 	size_t				 len = EVBUFFER_LENGTH(buffer);
 
 	wp = window_pane_find_by_id(cdata->wp);
-	if (wp == NULL || closed || error != 0 || c->flags & CLIENT_DEAD) {
+	if (wp == NULL || closed || error != 0 || (c->flags & CLIENT_DEAD)) {
 		if (wp == NULL)
 			c->flags |= CLIENT_EXIT;
 
@@ -1553,6 +1553,10 @@
 		*cause = xstrdup("pane is not empty");
 		return (-1);
 	}
+	if (c->flags & (CLIENT_DEAD|CLIENT_EXITED))
+		return (1);
+	if (c->session != NULL)
+		return (1);
 
 	cdata = xmalloc(sizeof *cdata);
 	cdata->item = item;