===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-client.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -c -r1.68 -r1.69
*** src/usr.bin/tmux/server-client.c	2012/03/09 21:42:13	1.68
--- src/usr.bin/tmux/server-client.c	2012/03/17 18:24:07	1.69
***************
*** 1,4 ****
! /* $OpenBSD: server-client.c,v 1.68 2012/03/09 21:42:13 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: server-client.c,v 1.69 2012/03/17 18:24:07 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 153,163 ****
  
  	evtimer_del(&c->repeat_timer);
  
! 	evtimer_del(&c->identify_timer);
  
  	if (c->message_string != NULL)
  		xfree(c->message_string);
! 	evtimer_del(&c->message_timer);
  	for (i = 0; i < ARRAY_LENGTH(&c->message_log); i++) {
  		msg = &ARRAY_ITEM(&c->message_log, i);
  		xfree(msg->msg);
--- 153,165 ----
  
  	evtimer_del(&c->repeat_timer);
  
! 	if (event_initialized(&c->identify_timer))
! 		evtimer_del(&c->identify_timer);
  
  	if (c->message_string != NULL)
  		xfree(c->message_string);
! 	if (event_initialized (&c->message_timer))
! 		evtimer_del(&c->message_timer);
  	for (i = 0; i < ARRAY_LENGTH(&c->message_log); i++) {
  		msg = &ARRAY_ITEM(&c->message_log, i);
  		xfree(msg->msg);
***************
*** 176,182 ****
  
  	close(c->ibuf.fd);
  	imsg_clear(&c->ibuf);
! 	event_del(&c->event);
  
  	for (i = 0; i < ARRAY_LENGTH(&dead_clients); i++) {
  		if (ARRAY_ITEM(&dead_clients, i) == NULL) {
--- 178,185 ----
  
  	close(c->ibuf.fd);
  	imsg_clear(&c->ibuf);
! 	if (event_initialized(&c->event))
! 		event_del(&c->event);
  
  	for (i = 0; i < ARRAY_LENGTH(&dead_clients); i++) {
  		if (ARRAY_ITEM(&dead_clients, i) == NULL) {