===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/session.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- src/usr.bin/tmux/session.c	2021/08/13 06:52:51	1.89
+++ src/usr.bin/tmux/session.c	2021/09/17 07:20:49	1.90
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.89 2021/08/13 06:52:51 nicm Exp $ */
+/* $OpenBSD: session.c,v 1.90 2021/09/17 07:20:49 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -205,6 +205,9 @@
 	struct winlink	*wl;
 
 	log_debug("session %s destroyed (%s)", s->name, from);
+
+	if (s->curw == NULL)
+		return;
 	s->curw = NULL;
 
 	RB_REMOVE(sessions, &sessions, s);