===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/spawn.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -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 ****
! /* $OpenBSD: spawn.c,v 1.4 2019/05/25 06:58:10 nicm Exp $ */
  
  /*
   * Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: spawn.c,v 1.5 2019/05/27 12:48:52 nicm Exp $ */
  
  /*
   * Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 161,166 ****
--- 161,168 ----
  			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