===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/session.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -c -r1.31 -r1.32
*** src/usr.bin/tmux/session.c	2011/04/06 21:51:31	1.31
--- src/usr.bin/tmux/session.c	2011/08/16 09:36:23	1.32
***************
*** 1,4 ****
! /* $OpenBSD: session.c,v 1.31 2011/04/06 21:51:31 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: session.c,v 1.32 2011/08/16 09:36:23 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 119,129 ****
  	s->sx = sx;
  	s->sy = sy;
  
! 	s->idx = next_session++;
! 	if (name != NULL)
  		s->name = xstrdup(name);
! 	else
! 		xasprintf(&s->name, "%u", s->idx);
  	RB_INSERT(sessions, &sessions, s);
  
  	if (cmd != NULL) {
--- 119,136 ----
  	s->sx = sx;
  	s->sy = sy;
  
! 	if (name != NULL) {
  		s->name = xstrdup(name);
! 		s->idx = next_session++;
! 	} else {
! 		s->name = NULL;
! 		do {
! 			s->idx = next_session++;
! 			if (s->name != NULL)
! 				xfree (s->name);
! 			xasprintf(&s->name, "%u", s->idx);
! 		} while (RB_FIND(sessions, &sessions, s) != NULL);
! 	}
  	RB_INSERT(sessions, &sessions, s);
  
  	if (cmd != NULL) {