From a61ab509b2be2d6ad72d23d0572cd4d35d986387 Mon Sep 17 00:00:00 2001 From: Frediano Ziglio Date: Mon, 25 Jan 2016 08:21:06 +0000 Subject: [PATCH] worker: remove useless check display_channel is never NULL. Signed-off-by: Frediano Ziglio Acked-by: Jonathon Jongsma --- server/red-worker.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/red-worker.c b/server/red-worker.c index 756ea255..eb87813a 100644 --- a/server/red-worker.c +++ b/server/red-worker.c @@ -321,8 +321,7 @@ static int red_process_display(RedWorker *worker, int *ring_is_empty) spice_error("bad command type"); } n++; - if ((worker->display_channel && - red_channel_all_blocked(&worker->display_channel->common.base)) + if (red_channel_all_blocked(&worker->display_channel->common.base) || spice_get_monotonic_time_ns() - start > NSEC_PER_SEC / 100) { worker->event_timeout = 0; return n;