===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-client.c,v
retrieving revision 1.281
retrieving revision 1.282
diff -c -r1.281 -r1.282
*** src/usr.bin/tmux/server-client.c	2019/05/07 20:01:41	1.281
--- src/usr.bin/tmux/server-client.c	2019/05/08 18:07:12	1.282
***************
*** 1,4 ****
! /* $OpenBSD: server-client.c,v 1.281 2019/05/07 20:01:41 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: server-client.c,v 1.282 2019/05/08 18:07:12 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 79,84 ****
--- 79,87 ----
  {
  	struct timeval	tv;
  
+ 	if (c->overlay_draw != NULL)
+ 		server_client_clear_overlay(c);
+ 
  	tv.tv_sec = delay / 1000;
  	tv.tv_usec = (delay % 1000) * 1000L;
  
***************
*** 1433,1438 ****
--- 1436,1443 ----
  
  	if (c->flags & (CLIENT_CONTROL|CLIENT_SUSPENDED))
  		return;
+ 	if (c->overlay_draw != NULL)
+ 		return;
  	mode = s->mode;
  
  	tty_region_off(&c->tty);
***************
*** 1543,1552 ****
  	if (c->flags & (CLIENT_CONTROL|CLIENT_SUSPENDED))
  		return;
  	if (c->flags & CLIENT_ALLREDRAWFLAGS) {
! 		log_debug("%s: redraw%s%s%s", c->name,
  		    (c->flags & CLIENT_REDRAWWINDOW) ? " window" : "",
  		    (c->flags & CLIENT_REDRAWSTATUS) ? " status" : "",
! 		    (c->flags & CLIENT_REDRAWBORDERS) ? " borders" : "");
  	}
  
  	/*
--- 1548,1558 ----
  	if (c->flags & (CLIENT_CONTROL|CLIENT_SUSPENDED))
  		return;
  	if (c->flags & CLIENT_ALLREDRAWFLAGS) {
! 		log_debug("%s: redraw%s%s%s%s", c->name,
  		    (c->flags & CLIENT_REDRAWWINDOW) ? " window" : "",
  		    (c->flags & CLIENT_REDRAWSTATUS) ? " status" : "",
! 		    (c->flags & CLIENT_REDRAWBORDERS) ? " borders" : "",
! 		    (c->flags & CLIENT_REDRAWOVERLAY) ? " overlay" : "");
  	}
  
  	/*
***************
*** 1702,1707 ****
--- 1708,1714 ----
  
  		if (c->flags & CLIENT_CONTROL)
  			break;
+ 		server_client_clear_overlay(c);
  		tty_resize(&c->tty);
  		recalculate_sizes();
  		server_redraw_client(c);