===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-switch-client.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -c -r1.40 -r1.41
*** src/usr.bin/tmux/cmd-switch-client.c	2015/12/14 00:31:54	1.40
--- src/usr.bin/tmux/cmd-switch-client.c	2015/12/23 00:12:57	1.41
***************
*** 1,4 ****
! /* $OpenBSD: cmd-switch-client.c,v 1.40 2015/12/14 00:31:54 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-switch-client.c,v 1.41 2015/12/23 00:12:57 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 90,99 ****
  			cmdq_error(cmdq, "can't find last session");
  			return (CMD_RETURN_ERROR);
  		}
  		if (cmdq->client == NULL)
  			return (CMD_RETURN_NORMAL);
- 
- 		s = state->tflag.s;
  		if (state->tflag.wl != NULL) {
  			wp = state->tflag.wp;
  			if (wp != NULL)
--- 90,98 ----
  			cmdq_error(cmdq, "can't find last session");
  			return (CMD_RETURN_ERROR);
  		}
+ 	} else {
  		if (cmdq->client == NULL)
  			return (CMD_RETURN_NORMAL);
  		if (state->tflag.wl != NULL) {
  			wp = state->tflag.wp;
  			if (wp != NULL)