===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-client.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -c -r1.120 -r1.121
*** src/usr.bin/tmux/server-client.c	2014/04/16 08:02:31	1.120
--- src/usr.bin/tmux/server-client.c	2014/07/13 20:23:10	1.121
***************
*** 1,4 ****
! /* $OpenBSD: server-client.c,v 1.120 2014/04/16 08:02:31 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: server-client.c,v 1.121 2014/07/13 20:23:10 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 874,879 ****
--- 874,882 ----
  			if (!(c->flags & CLIENT_SUSPENDED))
  				break;
  			c->flags &= ~CLIENT_SUSPENDED;
+ 
+ 			if (c->tty.fd == -1) /* exited in the meantime */
+ 				break;
  
  			if (gettimeofday(&c->activity_time, NULL) != 0)
  				fatal("gettimeofday");