aboutsummaryrefslogtreecommitdiff
path: root/server.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2008-11-04 20:55:58 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2008-11-04 20:55:58 +0000
commit4e4aefaf7ecfbd2df7a3dd371c86422ebb3d69f2 (patch)
tree5b074fd4e88a9c96331c8e69aff7ad6e5a7c5302 /server.c
parent6304e23984835f2e83aae34e99aa5c05576a208c (diff)
downloadrtmux-4e4aefaf7ecfbd2df7a3dd371c86422ebb3d69f2.tar.gz
rtmux-4e4aefaf7ecfbd2df7a3dd371c86422ebb3d69f2.tar.bz2
rtmux-4e4aefaf7ecfbd2df7a3dd371c86422ebb3d69f2.zip
Don't try to redraw status line in prompt mode.
Diffstat (limited to 'server.c')
-rw-r--r--server.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/server.c b/server.c
index 2b6c771e..82b1f07f 100644
--- a/server.c
+++ b/server.c
@@ -1,4 +1,4 @@
-/* $Id: server.c,v 1.83 2008-09-29 16:03:27 nicm Exp $ */
+/* $Id: server.c,v 1.84 2008-11-04 20:55:58 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -393,8 +393,16 @@ server_check_timers(struct client *c)
if (c->message_string != NULL && timercmp(&tv, &c->message_timer, >))
server_clear_client_message(c);
+ if (c->message_string != NULL || c->prompt_string != NULL) {
+ /*
+ * Don't need timed redraw for messages/prompts so bail now.
+ * The status timer isn't reset when they are redrawn anyway.
+ */
+ return;
+ }
if (!options_get_number(&s->options, "status"))
return;
+
interval = options_get_number(&s->options, "status-interval");
if (interval == 0)
return;