===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tty-keys.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -c -r1.35 -r1.36
*** src/usr.bin/tmux/tty-keys.c	2012/03/15 10:36:00	1.35
--- src/usr.bin/tmux/tty-keys.c	2012/03/17 18:24:07	1.36
***************
*** 1,4 ****
! /* $OpenBSD: tty-keys.c,v 1.35 2012/03/15 10:36:00 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tty-keys.c,v 1.36 2012/03/17 18:24:07 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 549,555 ****
  	tv.tv_sec = delay / 1000;
  	tv.tv_usec = (delay % 1000) * 1000L;
  
! 	evtimer_del(&tty->key_timer);
  	evtimer_set(&tty->key_timer, tty_keys_callback, tty);
  	evtimer_add(&tty->key_timer, &tv);
  
--- 549,556 ----
  	tv.tv_sec = delay / 1000;
  	tv.tv_usec = (delay % 1000) * 1000L;
  
! 	if (event_initialized(&tty->key_timer))
! 		evtimer_del(&tty->key_timer);
  	evtimer_set(&tty->key_timer, tty_keys_callback, tty);
  	evtimer_add(&tty->key_timer, &tv);
  
***************
*** 573,579 ****
  	goto handle_key;
  
  handle_key:
! 	evtimer_del(&tty->key_timer);
  
  	if (key != KEYC_NONE)
  		tty->key_callback(key, &mouse, tty->key_data);
--- 574,581 ----
  	goto handle_key;
  
  handle_key:
! 	if (event_initialized(&tty->key_timer))
! 		evtimer_del(&tty->key_timer);
  
  	if (key != KEYC_NONE)
  		tty->key_callback(key, &mouse, tty->key_data);