aboutsummaryrefslogtreecommitdiff
path: root/server-client.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2016-10-09 18:01:10 +0100
committerThomas Adam <thomas@xteddy.org>2016-10-09 18:01:10 +0100
commit215d3f8c0d0a604f138b976b2e49ce3fe1a50eb2 (patch)
tree8e88732501d4ef0b54b2adeacb449090c39cc183 /server-client.c
parent526e860a7a831b9bab82623e64a1b30b2b1ca5e6 (diff)
parentb8f2dd8237dca568308e1c273f376191f55e880e (diff)
downloadrtmux-215d3f8c0d0a604f138b976b2e49ce3fe1a50eb2.tar.gz
rtmux-215d3f8c0d0a604f138b976b2e49ce3fe1a50eb2.tar.bz2
rtmux-215d3f8c0d0a604f138b976b2e49ce3fe1a50eb2.zip
Merge branch 'obsd-master'
Diffstat (limited to 'server-client.c')
-rw-r--r--server-client.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/server-client.c b/server-client.c
index 311b2d3b..5f1a58f1 100644
--- a/server-client.c
+++ b/server-client.c
@@ -959,7 +959,7 @@ server_client_check_redraw(struct client *c)
struct session *s = c->session;
struct tty *tty = &c->tty;
struct window_pane *wp;
- int flags, masked, redraw;
+ int flags, masked;
if (c->flags & (CLIENT_CONTROL|CLIENT_SUSPENDED))
return;
@@ -967,15 +967,7 @@ server_client_check_redraw(struct client *c)
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;
+ screen_redraw_update(c); /* will adjust flags */
}
flags = tty->flags & (TTY_FREEZE|TTY_NOCURSOR);