===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/alerts.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -c -r1.21 -r1.22
*** src/usr.bin/tmux/alerts.c	2017/07/26 16:14:08	1.21
--- src/usr.bin/tmux/alerts.c	2017/07/26 16:16:25	1.22
***************
*** 1,4 ****
! /* $OpenBSD: alerts.c,v 1.21 2017/07/26 16:14:08 nicm Exp $ */
  
  /*
   * Copyright (c) 2015 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: alerts.c,v 1.22 2017/07/26 16:16:25 nicm Exp $ */
  
  /*
   * Copyright (c) 2015 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 45,51 ****
  	struct window	*w = arg;
  
  	log_debug("@%u alerts timer expired", w->id);
- 	alerts_reset(w);
  	alerts_queue(w, WINDOW_SILENCE);
  }
  
--- 45,50 ----
***************
*** 132,139 ****
  void
  alerts_queue(struct window *w, int flags)
  {
! 	if (w->flags & WINDOW_ACTIVITY)
! 		alerts_reset(w);
  
  	if (!event_initialized(&w->alerts_timer))
  		evtimer_set(&w->alerts_timer, alerts_timer, w);
--- 131,137 ----
  void
  alerts_queue(struct window *w, int flags)
  {
! 	alerts_reset(w);
  
  	if (!event_initialized(&w->alerts_timer))
  		evtimer_set(&w->alerts_timer, alerts_timer, w);