diff options
author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2014-03-07 15:37:01 +0000 |
---|---|---|
committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2014-03-07 15:37:01 +0000 |
commit | 683ca270d4b3ffc64a0d9cb86161dfb48a7fe0ca (patch) | |
tree | 06b7e5c41a6ada65ed74f1e7d04444c854f923a5 /status.c | |
parent | 78e783e7863eb33981da4a5ad48dd9e2aa2b08dd (diff) | |
download | rtmux-683ca270d4b3ffc64a0d9cb86161dfb48a7fe0ca.tar.gz rtmux-683ca270d4b3ffc64a0d9cb86161dfb48a7fe0ca.tar.bz2 rtmux-683ca270d4b3ffc64a0d9cb86161dfb48a7fe0ca.zip |
Make message-limit a server option.
Diffstat (limited to 'status.c')
-rw-r--r-- | status.c | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -655,7 +655,6 @@ void printflike2 status_message_set(struct client *c, const char *fmt, ...) { struct timeval tv; - struct session *s = c->session; struct message_entry *msg; va_list ap; int delay; @@ -673,10 +672,7 @@ status_message_set(struct client *c, const char *fmt, ...) msg->msg_time = time(NULL); msg->msg = xstrdup(c->message_string); - if (s == NULL) - limit = 0; - else - limit = options_get_number(&s->options, "message-limit"); + limit = options_get_number(&global_options, "message-limit"); if (ARRAY_LENGTH(&c->message_log) > limit) { limit = ARRAY_LENGTH(&c->message_log) - limit; for (i = 0; i < limit; i++) { |