===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-client.c,v
retrieving revision 1.264
retrieving revision 1.265
diff -c -r1.264 -r1.265
*** src/usr.bin/tmux/server-client.c	2018/12/18 13:20:44	1.264
--- src/usr.bin/tmux/server-client.c	2019/02/16 11:42:08	1.265
***************
*** 1,4 ****
! /* $OpenBSD: server-client.c,v 1.264 2018/12/18 13:20:44 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: server-client.c,v 1.265 2019/02/16 11:42:08 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 1982,1987 ****
--- 1982,1989 ----
  {
  	const char	*home;
  
+ 	if (!cfg_finished && cfg_client != NULL)
+ 		return (cfg_client->cwd);
  	if (c != NULL && c->session == NULL && c->cwd != NULL)
  		return (c->cwd);
  	if (s != NULL && s->cwd != NULL)