===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-new-session.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -c -r1.54 -r1.55
*** src/usr.bin/tmux/cmd-new-session.c	2013/10/10 12:26:35	1.54
--- src/usr.bin/tmux/cmd-new-session.c	2013/10/10 12:28:38	1.55
***************
*** 1,4 ****
! /* $OpenBSD: cmd-new-session.c,v 1.54 2013/10/10 12:26:35 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-new-session.c,v 1.55 2013/10/10 12:28:38 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 115,121 ****
  			return (CMD_RETURN_ERROR);
  		}
  		cwd = fd;
! 	} else if (c->session == NULL)
  		cwd = c->cwd;
  	else if ((c0 = cmd_current_client(cmdq)) != NULL)
  		cwd = c0->session->cwd;
--- 115,121 ----
  			return (CMD_RETURN_ERROR);
  		}
  		cwd = fd;
! 	} else if (c != NULL && c->session == NULL)
  		cwd = c->cwd;
  	else if ((c0 = cmd_current_client(cmdq)) != NULL)
  		cwd = c0->session->cwd;