From d06fd6a2f9a21ef6d6dde1e1e93233fcff84c473 Mon Sep 17 00:00:00 2001 From: Frediano Ziglio Date: Fri, 16 Sep 2016 22:08:18 +0100 Subject: [PATCH] worker: Do not check surface twice validate_surface already do the same checks. Signed-off-by: Frediano Ziglio Acked-by: Jonathon Jongsma --- server/red-worker.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/server/red-worker.c b/server/red-worker.c index 27ab8a2b..a2cd2e80 100644 --- a/server/red-worker.c +++ b/server/red-worker.c @@ -662,15 +662,11 @@ static void destroy_primary_surface(RedWorker *worker, uint32_t surface_id) { DisplayChannel *display = worker->display_channel; - if (!display_channel_validate_surface(display, surface_id)) - return; - spice_warn_if_fail(surface_id == 0); - - spice_debug(NULL); - if (!display_channel_surface_has_canvas(display, surface_id)) { + if (!display_channel_validate_surface(display, surface_id)) { spice_warning("double destroy of primary surface"); return; } + spice_warn_if_fail(surface_id == 0); flush_all_qxl_commands(worker); display_channel_destroy_surface_wait(display, 0);