===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-new-session.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -c -r1.89 -r1.90
*** src/usr.bin/tmux/cmd-new-session.c	2016/10/13 10:01:49	1.89
--- src/usr.bin/tmux/cmd-new-session.c	2016/10/13 22:48:51	1.90
***************
*** 1,4 ****
! /* $OpenBSD: cmd-new-session.c,v 1.89 2016/10/13 10:01:49 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-new-session.c,v 1.90 2016/10/13 22:48:51 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 80,85 ****
--- 80,86 ----
  	u_int			 sx, sy;
  	struct format_tree	*ft;
  	struct environ_entry	*envent;
+ 	struct cmd_find_state	 fs;
  
  	if (self->entry == &cmd_has_session_entry) {
  		/*
***************
*** 310,322 ****
  		format_free(ft);
  	}
  
- 	cmd_find_from_session(&cmdq->current, s);
- 
  	if (!detached)
  		cmdq->client_exit = 0;
  
  	if (to_free != NULL)
  		free((void *)to_free);
  	return (CMD_RETURN_NORMAL);
  
  error:
--- 311,325 ----
  		format_free(ft);
  	}
  
  	if (!detached)
  		cmdq->client_exit = 0;
  
  	if (to_free != NULL)
  		free((void *)to_free);
+ 
+ 	cmd_find_from_session(&fs, s);
+ 	if (hooks_wait(s->hooks, cmdq, &fs, "after-new-session") == 0)
+ 		return (CMD_RETURN_WAIT);
  	return (CMD_RETURN_NORMAL);
  
  error: