From 031be1fc7283bd400ff60b216a38fa734415ca15 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Wed, 4 Jun 2008 05:47:46 +0000 Subject: Don't crash when looking at NULL clients; also redraw everything on status change. --- server.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'server.c') diff --git a/server.c b/server.c index ec2cff0e..ff2411c7 100644 --- a/server.c +++ b/server.c @@ -1,4 +1,4 @@ -/* $Id: server.c,v 1.50 2008-06-04 05:40:35 nicm Exp $ */ +/* $Id: server.c,v 1.51 2008-06-04 05:47:46 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -296,16 +296,15 @@ server_handle_clients(struct pollfd **pfd) for (i = 0; i < ARRAY_LENGTH(&clients); i++) { c = ARRAY_ITEM(&clients, i); - /* XXX REDRAW FLAGS */ - if (c->session != NULL && options_get_number( - &c->session->options, "status-lines") != 0) { - if (clock_gettime(CLOCK_REALTIME, &now) != 0) - fatal("clock_gettime"); - if (timespeccmp(&now, &c->status_ts, >)) - server_status_client(c); - } - if (c != NULL) { + if (c->session != NULL && options_get_number( + &c->session->options, "status-lines") != 0) { + if (clock_gettime(CLOCK_REALTIME, &now) != 0) + fatal("clock_gettime"); + if (timespeccmp(&now, &c->status_ts, >)) + server_status_client(c); + } + log_debug("testing client %d (%d)", (*pfd)->fd, c->fd); if (buffer_poll(*pfd, c->in, c->out) != 0) { server_lost_client(c); -- cgit v1.2.3