===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/client.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -c -r1.59 -r1.60
*** src/usr.bin/tmux/client.c	2012/08/27 21:35:11	1.59
--- src/usr.bin/tmux/client.c	2012/09/03 08:48:57	1.60
***************
*** 1,4 ****
! /* $OpenBSD: client.c,v 1.59 2012/08/27 21:35:11 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: client.c,v 1.60 2012/09/03 08:48:57 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 281,287 ****
  
  	/* Set the event and dispatch. */
  	client_update_event();
- 	event_add (&client_stdin, NULL);
  	event_dispatch();
  
  	/* Print the exit message, if any, and exit. */
--- 281,286 ----
***************
*** 515,520 ****
--- 514,525 ----
  
  			event_del(&client_stdin);
  			client_attached = 1;
+ 			break;
+ 		case MSG_STDIN:
+ 			if (datalen != 0)
+ 				fatalx("bad MSG_STDIN size");
+ 
+ 			event_add(&client_stdin, NULL);
  			break;
  		case MSG_STDOUT:
  			if (datalen != sizeof stdoutdata)