===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-save-buffer.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -c -r1.36 -r1.37
*** src/usr.bin/tmux/cmd-save-buffer.c	2015/12/13 21:53:57	1.36
--- src/usr.bin/tmux/cmd-save-buffer.c	2016/03/05 07:47:52	1.37
***************
*** 1,4 ****
! /* $OpenBSD: cmd-save-buffer.c,v 1.36 2015/12/13 21:53:57 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
--- 1,4 ----
! /* $OpenBSD: cmd-save-buffer.c,v 1.37 2016/03/05 07:47:52 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
***************
*** 98,106 ****
  		goto do_print;
  	}
  
! 	if (c != NULL && c->session == NULL)
  		cwd = c->cwd;
! 	else if ((s = c->session) != NULL)
  		cwd = s->cwd;
  	else
  		cwd = ".";
--- 98,106 ----
  		goto do_print;
  	}
  
! 	if (c != NULL && c->session == NULL && c->cwd != NULL)
  		cwd = c->cwd;
! 	else if ((s = c->session) != NULL && s->cwd != NULL)
  		cwd = s->cwd;
  	else
  		cwd = ".";