===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-if-shell.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -c -r1.40 -r1.41
*** src/usr.bin/tmux/cmd-if-shell.c	2015/12/14 00:31:54	1.40
--- src/usr.bin/tmux/cmd-if-shell.c	2016/03/01 12:06:07	1.41
***************
*** 1,4 ****
! /* $OpenBSD: cmd-if-shell.c,v 1.40 2015/12/14 00:31:54 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
--- 1,4 ----
! /* $OpenBSD: cmd-if-shell.c,v 1.41 2016/03/01 12:06:07 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
***************
*** 73,86 ****
  	struct format_tree		*ft;
  	const char			*cwd;
  
- 	cwd = wp->cwd;
- 
  	if (cmdq->client != NULL && cmdq->client->session == NULL)
  		cwd = cmdq->client->cwd;
  	else if (s != NULL)
  		cwd = s->cwd;
  	else
  		cwd = NULL;
  	ft = format_create(cmdq, 0);
  	format_defaults(ft, NULL, s, wl, wp);
  	shellcmd = format_expand(ft, args->argv[0]);
--- 73,85 ----
  	struct format_tree		*ft;
  	const char			*cwd;
  
  	if (cmdq->client != NULL && cmdq->client->session == NULL)
  		cwd = cmdq->client->cwd;
  	else if (s != NULL)
  		cwd = s->cwd;
  	else
  		cwd = NULL;
+ 
  	ft = format_create(cmdq, 0);
  	format_defaults(ft, NULL, s, wl, wp);
  	shellcmd = format_expand(ft, args->argv[0]);