===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-fn.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -c -r1.35 -r1.36
*** src/usr.bin/tmux/server-fn.c	2010/03/22 19:18:46	1.35
--- src/usr.bin/tmux/server-fn.c	2010/04/17 23:25:16	1.36
***************
*** 1,4 ****
! /* $OpenBSD: server-fn.c,v 1.35 2010/03/22 19:18:46 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: server-fn.c,v 1.36 2010/04/17 23:25:16 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 325,333 ****
  {
  	struct window	*w = wp->window;
  
! 	close(wp->fd);
! 	bufferevent_free(wp->event);
! 	wp->fd = -1;
  
  	if (options_get_number(&w->options, "remain-on-exit"))
  		return;
--- 325,335 ----
  {
  	struct window	*w = wp->window;
  
! 	if (wp->fd != -1) {
! 		close(wp->fd);
! 		bufferevent_free(wp->event);
! 		wp->fd = -1;
! 	}
  
  	if (options_get_number(&w->options, "remain-on-exit"))
  		return;