===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-fn.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -c -r1.53 -r1.54
*** src/usr.bin/tmux/server-fn.c	2012/01/29 02:22:11	1.53
--- src/usr.bin/tmux/server-fn.c	2012/03/17 18:24:07	1.54
***************
*** 1,4 ****
! /* $OpenBSD: server-fn.c,v 1.53 2012/01/29 02:22:11 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: server-fn.c,v 1.54 2012/03/17 18:24:07 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 453,459 ****
  	tv.tv_sec = delay / 1000;
  	tv.tv_usec = (delay % 1000) * 1000L;
  
! 	evtimer_del(&c->identify_timer);
  	evtimer_set(&c->identify_timer, server_callback_identify, c);
  	evtimer_add(&c->identify_timer, &tv);
  
--- 453,460 ----
  	tv.tv_sec = delay / 1000;
  	tv.tv_usec = (delay % 1000) * 1000L;
  
! 	if (event_initialized (&c->identify_timer))
! 		evtimer_del(&c->identify_timer);
  	evtimer_set(&c->identify_timer, server_callback_identify, c);
  	evtimer_add(&c->identify_timer, &tv);
  
***************
*** 491,497 ****
  		events |= EV_READ;
  	if (c->ibuf.w.queued > 0)
  		events |= EV_WRITE;
! 	event_del(&c->event);
  	event_set(&c->event, c->ibuf.fd, events, server_client_callback, c);
  	event_add(&c->event, NULL);
  }
--- 492,499 ----
  		events |= EV_READ;
  	if (c->ibuf.w.queued > 0)
  		events |= EV_WRITE;
! 	if (event_initialized(&c->event))
! 		event_del(&c->event);
  	event_set(&c->event, c->ibuf.fd, events, server_client_callback, c);
  	event_add(&c->event, NULL);
  }