===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-new-window.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -c -r1.35 -r1.36
*** src/usr.bin/tmux/cmd-new-window.c	2013/10/10 12:26:35	1.35
--- src/usr.bin/tmux/cmd-new-window.c	2013/10/10 12:28:38	1.36
***************
*** 1,4 ****
! /* $OpenBSD: cmd-new-window.c,v 1.35 2013/10/10 12:26:35 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-new-window.c,v 1.36 2013/10/10 12:28:38 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 125,131 ****
  			return (CMD_RETURN_ERROR);
  		}
  		cwd = fd;
! 	} else if (cmdq->client->session == NULL)
  		cwd = cmdq->client->cwd;
  	else
  		cwd = s->cwd;
--- 125,131 ----
  			return (CMD_RETURN_ERROR);
  		}
  		cwd = fd;
! 	} else if (cmdq->client != NULL && cmdq->client->session == NULL)
  		cwd = cmdq->client->cwd;
  	else
  		cwd = s->cwd;