===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/spawn.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- src/usr.bin/tmux/spawn.c	2019/05/25 06:58:10	1.4
+++ src/usr.bin/tmux/spawn.c	2019/05/27 12:48:52	1.5
@@ -1,4 +1,4 @@
-/* $OpenBSD: spawn.c,v 1.4 2019/05/25 06:58:10 nicm Exp $ */
+/* $OpenBSD: spawn.c,v 1.5 2019/05/27 12:48:52 nicm Exp $ */
 
 /*
  * Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -161,6 +161,8 @@
 			xasprintf(cause, "couldn't create window %d", idx);
 			return (NULL);
 		}
+		if (s->curw == NULL)
+			s->curw = sc->wl;
 		sc->wl->session = s;
 		winlink_set_window(sc->wl, w);
 	} else