aboutsummaryrefslogtreecommitdiff
path: root/server-client.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2017-08-16 14:01:15 +0100
committerThomas Adam <thomas@xteddy.org>2017-08-16 14:01:15 +0100
commit2103a09430142725ea933dcf434c79460ab419f1 (patch)
treea5ee1d7b8a303078b713a891edc0a177082522bb /server-client.c
parent0824850bbce86c395230700cb10c81f162319858 (diff)
parentc6a8ad23a14034ee956bcb45748f743ef5d0c1fc (diff)
downloadrtmux-2103a09430142725ea933dcf434c79460ab419f1.tar.gz
rtmux-2103a09430142725ea933dcf434c79460ab419f1.tar.bz2
rtmux-2103a09430142725ea933dcf434c79460ab419f1.zip
Merge branch 'obsd-master'
Diffstat (limited to 'server-client.c')
-rw-r--r--server-client.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/server-client.c b/server-client.c
index 61d4f45f..cf9e8b31 100644
--- a/server-client.c
+++ b/server-client.c
@@ -72,19 +72,18 @@ server_client_callback_identify(__unused int fd, __unused short events,
/* Set identify mode on client. */
void
-server_client_set_identify(struct client *c)
+server_client_set_identify(struct client *c, u_int delay)
{
struct timeval tv;
- int delay;
- delay = options_get_number(c->session->options, "display-panes-time");
tv.tv_sec = delay / 1000;
tv.tv_usec = (delay % 1000) * 1000L;
if (event_initialized(&c->identify_timer))
evtimer_del(&c->identify_timer);
evtimer_set(&c->identify_timer, server_client_callback_identify, c);
- evtimer_add(&c->identify_timer, &tv);
+ if (delay != 0)
+ evtimer_add(&c->identify_timer, &tv);
c->flags |= CLIENT_IDENTIFY;
c->tty.flags |= (TTY_FREEZE|TTY_NOCURSOR);