===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-switch-client.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -c -r1.8 -r1.9
*** src/usr.bin/tmux/cmd-switch-client.c	2010/12/11 18:39:25	1.8
--- src/usr.bin/tmux/cmd-switch-client.c	2010/12/20 00:17:22	1.9
***************
*** 1,4 ****
! /* $OpenBSD: cmd-switch-client.c,v 1.8 2010/12/11 18:39:25 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-switch-client.c,v 1.9 2010/12/20 00:17:22 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 159,167 ****
  			return (-1);
  		}
  	} else if (data->flag_last) {
! 		if (c->last_session != UINT_MAX &&
! 		    c->last_session < ARRAY_LENGTH(&sessions))
! 			s = ARRAY_ITEM(&sessions, c->last_session);
  		if (s == NULL) {
  			ctx->error(ctx, "can't find last session");
  			return (-1);
--- 159,166 ----
  			return (-1);
  		}
  	} else if (data->flag_last) {
! 		if (c->last_session != NULL && session_alive(c->last_session))
! 			s = c->last_session;
  		if (s == NULL) {
  			ctx->error(ctx, "can't find last session");
  			return (-1);
***************
*** 172,178 ****
  		return (-1);
  
  	if (c->session != NULL)
! 		session_index(c->session, &c->last_session);
  	c->session = s;
  
  	recalculate_sizes();
--- 171,177 ----
  		return (-1);
  
  	if (c->session != NULL)
! 		c->last_session = c->session;
  	c->session = s;
  
  	recalculate_sizes();