diff options
| author | Thomas Adam <thomas@xteddy.org> | 2014-02-16 23:02:07 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2014-02-16 23:02:07 +0000 |
| commit | b3de4a3dec85bc84bb83da6b46e2a8e2a634ace3 (patch) | |
| tree | 8704cc16b1ed5380bcd7c678351d85adfd5907c8 /server-client.c | |
| parent | 8edbbb98656a76f0a25b5243b526709a67ae3531 (diff) | |
| parent | 81db6bab91309e7cb42628048408c10504522a48 (diff) | |
| download | rtmux-b3de4a3dec85bc84bb83da6b46e2a8e2a634ace3.tar.gz rtmux-b3de4a3dec85bc84bb83da6b46e2a8e2a634ace3.tar.bz2 rtmux-b3de4a3dec85bc84bb83da6b46e2a8e2a634ace3.zip | |
Merge branch 'obsd-master'
Conflicts:
tmux.1
tmux.c
Diffstat (limited to 'server-client.c')
| -rw-r--r-- | server-client.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/server-client.c b/server-client.c index ce1074a2..3630a672 100644 --- a/server-client.c +++ b/server-client.c @@ -67,9 +67,9 @@ server_client_create(int fd) c->cmdq = cmdq_new(c); c->cmdq->client_exit = 1; - c->stdin_data = evbuffer_new (); - c->stdout_data = evbuffer_new (); - c->stderr_data = evbuffer_new (); + c->stdin_data = evbuffer_new(); + c->stdout_data = evbuffer_new(); + c->stderr_data = evbuffer_new(); c->tty.fd = -1; c->title = NULL; @@ -122,7 +122,7 @@ server_client_open(struct client *c, struct session *s, char **cause) return (0); if (!(c->flags & CLIENT_TERMINAL)) { - *cause = xstrdup ("not a terminal"); + *cause = xstrdup("not a terminal"); return (-1); } @@ -173,7 +173,7 @@ server_client_lost(struct client *c) evtimer_del(&c->identify_timer); free(c->message_string); - if (event_initialized (&c->message_timer)) + if (event_initialized(&c->message_timer)) evtimer_del(&c->message_timer); for (i = 0; i < ARRAY_LENGTH(&c->message_log); i++) { msg = &ARRAY_ITEM(&c->message_log, i); @@ -279,7 +279,7 @@ server_client_status_timer(void) interval = options_get_number(&s->options, "status-interval"); difference = tv.tv_sec - c->status_timer.tv_sec; - if (difference >= interval) { + if (interval != 0 && difference >= interval) { status_update_jobs(c); c->flags |= CLIENT_STATUS; } |