extern/tmate
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate.git synced 2024-11-23 16:43:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix status bar timeout when the client is not yet connected to the session

Browse Source
This commit is contained in:
Nicolas Viennot 2013-07-23 16:21:52 -04:00
parent ebc4e5ecdf
commit b97568cac2
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tmate-msg.c
View File

@ -23,10 +23,15 @@ static void tmate_status_message_client(struct client *c, const char *message)
msg->msg_time = time(NULL); msg->msg_time = time(NULL);
msg->msg = xstrdup(c->message_string); msg->msg = xstrdup(c->message_string);
if (!s) if (s) {
return; limit = options_get_number(&s->options, "message-limit");
delay = options_get_number(&s->options, "tmate-display-time");
} else {
/* Very early in the connection process we won't have a session */
limit = options_get_number(&global_s_options, "message-limit");
delay = options_get_number(&global_s_options, "tmate-display-time");
}
limit = options_get_number(&s->options, "message-limit");
if (ARRAY_LENGTH(&c->message_log) > limit) { if (ARRAY_LENGTH(&c->message_log) > limit) {
limit = ARRAY_LENGTH(&c->message_log) - limit; limit = ARRAY_LENGTH(&c->message_log) - limit;
for (i = 0; i < limit; i++) { for (i = 0; i < limit; i++) {
@ -36,7 +41,6 @@ static void tmate_status_message_client(struct client *c, const char *message)
} }
} }
delay = options_get_number(&c->session->options, "tmate-display-time");
tv.tv_sec = delay / 1000; tv.tv_sec = delay / 1000;
tv.tv_usec = (delay % 1000) * 1000L; tv.tv_usec = (delay % 1000) * 1000L;