===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-client.c,v
retrieving revision 1.188
retrieving revision 1.189
diff -c -r1.188 -r1.189
*** src/usr.bin/tmux/server-client.c	2016/09/28 08:30:44	1.188
--- src/usr.bin/tmux/server-client.c	2016/10/09 16:24:34	1.189
***************
*** 1,4 ****
! /* $OpenBSD: server-client.c,v 1.188 2016/09/28 08:30:44 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: server-client.c,v 1.189 2016/10/09 16:24:34 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 951,957 ****
  	struct session		*s = c->session;
  	struct tty		*tty = &c->tty;
  	struct window_pane	*wp;
! 	int		 	 flags, masked, redraw;
  
  	if (c->flags & (CLIENT_CONTROL|CLIENT_SUSPENDED))
  		return;
--- 951,957 ----
  	struct session		*s = c->session;
  	struct tty		*tty = &c->tty;
  	struct window_pane	*wp;
! 	int		 	 flags, masked;
  
  	if (c->flags & (CLIENT_CONTROL|CLIENT_SUSPENDED))
  		return;
***************
*** 959,973 ****
  	if (c->flags & (CLIENT_REDRAW|CLIENT_STATUS)) {
  		if (options_get_number(s->options, "set-titles"))
  			server_client_set_title(c);
! 
! 		if (c->message_string != NULL)
! 			redraw = status_message_redraw(c);
! 		else if (c->prompt_string != NULL)
! 			redraw = status_prompt_redraw(c);
! 		else
! 			redraw = status_redraw(c);
! 		if (!redraw)
! 			c->flags &= ~CLIENT_STATUS;
  	}
  
  	flags = tty->flags & (TTY_FREEZE|TTY_NOCURSOR);
--- 959,965 ----
  	if (c->flags & (CLIENT_REDRAW|CLIENT_STATUS)) {
  		if (options_get_number(s->options, "set-titles"))
  			server_client_set_title(c);
! 		screen_redraw_update(c); /* will adjust flags */
  	}
  
  	flags = tty->flags & (TTY_FREEZE|TTY_NOCURSOR);