aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--status.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/status.c b/status.c
index ca78bd53..cbacfe4c 100644
--- a/status.c
+++ b/status.c
@@ -547,7 +547,7 @@ status_message_set(struct client *c, const char *fmt, ...)
struct message_entry *msg, *msg1;
va_list ap;
int delay;
- u_int first, limit;
+ u_int limit;
limit = options_get_number(global_options, "message-limit");
@@ -564,10 +564,9 @@ status_message_set(struct client *c, const char *fmt, ...)
msg->msg = xstrdup(c->message_string);
TAILQ_INSERT_TAIL(&c->message_log, msg, entry);
- first = c->message_next - limit;
TAILQ_FOREACH_SAFE(msg, &c->message_log, entry, msg1) {
- if (msg->msg_num >= first)
- continue;
+ if (msg->msg_num + limit >= c->message_next)
+ break;
free(msg->msg);
TAILQ_REMOVE(&c->message_log, msg, entry);
free(msg);