aboutsummaryrefslogtreecommitdiff
path: root/status.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2016-12-08 00:01:10 +0000
committerThomas Adam <thomas@xteddy.org>2016-12-08 00:01:10 +0000
commitd3ede11212b78beebea5d02a7cfc35e65e8f8349 (patch)
treee2c77d4018208ad5cd903bed35056239b31150b8 /status.c
parentb9fa8f12d7b56a331a53f347bfe81e62ca351dc5 (diff)
parent5819d2a9d75511c4ba7fd7adbeec6b778647e0d7 (diff)
downloadrtmux-d3ede11212b78beebea5d02a7cfc35e65e8f8349.tar.gz
rtmux-d3ede11212b78beebea5d02a7cfc35e65e8f8349.tar.bz2
rtmux-d3ede11212b78beebea5d02a7cfc35e65e8f8349.zip
Merge branch 'obsd-master'
Diffstat (limited to 'status.c')
-rw-r--r--status.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/status.c b/status.c
index 4cdd4932..bd77b90d 100644
--- a/status.c
+++ b/status.c
@@ -554,7 +554,6 @@ status_message_set(struct client *c, const char *fmt, ...)
limit = options_get_number(global_options, "message-limit");
- status_prompt_clear(c);
status_message_clear(c);
va_start(ap, fmt);
@@ -600,7 +599,8 @@ status_message_clear(struct client *c)
free(c->message_string);
c->message_string = NULL;
- c->tty.flags &= ~(TTY_NOCURSOR|TTY_FREEZE);
+ if (c->prompt_string == NULL)
+ c->tty.flags &= ~(TTY_NOCURSOR|TTY_FREEZE);
c->flags |= CLIENT_REDRAW; /* screen was frozen and may have changed */
screen_reinit(&c->status);