===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/session.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -c -r1.76 -r1.77
*** src/usr.bin/tmux/session.c	2017/05/04 07:16:43	1.76
--- src/usr.bin/tmux/session.c	2017/07/09 22:33:09	1.77
***************
*** 1,4 ****
! /* $OpenBSD: session.c,v 1.76 2017/05/04 07:16:43 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: session.c,v 1.77 2017/07/09 22:33:09 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 178,184 ****
  	if (argc >= 0) {
  		wl = session_new(s, NULL, argc, argv, path, cwd, idx, cause);
  		if (wl == NULL) {
! 			session_destroy(s);
  			return (NULL);
  		}
  		session_select(s, RB_ROOT(&s->windows)->idx);
--- 178,184 ----
  	if (argc >= 0) {
  		wl = session_new(s, NULL, argc, argv, path, cwd, idx, cause);
  		if (wl == NULL) {
! 			session_destroy(s, __func__);
  			return (NULL);
  		}
  		session_select(s, RB_ROOT(&s->windows)->idx);
***************
*** 229,239 ****
  
  /* Destroy a session. */
  void
! session_destroy(struct session *s)
  {
  	struct winlink	*wl;
  
! 	log_debug("session %s destroyed", s->name);
  	s->curw = NULL;
  
  	RB_REMOVE(sessions, &sessions, s);
--- 229,239 ----
  
  /* Destroy a session. */
  void
! session_destroy(struct session *s, const char *from)
  {
  	struct winlink	*wl;
  
! 	log_debug("session %s destroyed (%s)", s->name, from);
  	s->curw = NULL;
  
  	RB_REMOVE(sessions, &sessions, s);
***************
*** 419,425 ****
  	session_group_synchronize_from(s);
  
  	if (RB_EMPTY(&s->windows)) {
! 		session_destroy(s);
  		return (1);
  	}
  	return (0);
--- 419,425 ----
  	session_group_synchronize_from(s);
  
  	if (RB_EMPTY(&s->windows)) {
! 		session_destroy(s, __func__);
  		return (1);
  	}
  	return (0);