===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/spawn.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -c -r1.14 -r1.15
*** src/usr.bin/tmux/spawn.c	2020/01/28 10:21:21	1.14
--- src/usr.bin/tmux/spawn.c	2020/03/02 08:30:30	1.15
***************
*** 1,4 ****
! /* $OpenBSD: spawn.c,v 1.14 2020/01/28 10:21:21 nicm Exp $ */
  
  /*
   * Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: spawn.c,v 1.15 2020/03/02 08:30:30 nicm Exp $ */
  
  /*
   * Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 230,238 ****
  	 * the pane's stored one unless specified.
  	 */
  	if (sc->cwd != NULL)
! 		cwd = format_single(item, sc->cwd, c, s, NULL, NULL);
  	else if (~sc->flags & SPAWN_RESPAWN)
! 		cwd = xstrdup(server_client_get_cwd(c, s));
  	else
  		cwd = NULL;
  
--- 230,238 ----
  	 * the pane's stored one unless specified.
  	 */
  	if (sc->cwd != NULL)
! 		cwd = format_single(item, sc->cwd, c, item->target.s, NULL, NULL);
  	else if (~sc->flags & SPAWN_RESPAWN)
! 		cwd = xstrdup(server_client_get_cwd(c, item->target.s));
  	else
  		cwd = NULL;