From 61e5a2727a0625a7f082ced749b6d41f88ea84e3 Mon Sep 17 00:00:00 2001 From: Pekka Paalanen Date: Wed, 13 Sep 2017 17:22:38 +0300 Subject: [PATCH] compositor-fbdev: always destroy renderer-output on disable If we pass the base->enabled test, then the renderer output is guaranteed to be there, so we can just destroy it. Destroying it before unmap makes the sequence match better the enable path. Signed-off-by: Pekka Paalanen Reviewed-by: Ian Ray Acked-by Daniel Stone --- libweston/compositor-fbdev.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libweston/compositor-fbdev.c b/libweston/compositor-fbdev.c index 01ee18f0..8a3ce0de 100644 --- a/libweston/compositor-fbdev.c +++ b/libweston/compositor-fbdev.c @@ -485,11 +485,9 @@ fbdev_output_disable_handler(struct weston_output *base) if (!base->enabled) return 0; + pixman_renderer_output_destroy(&output->base); fbdev_frame_buffer_unmap(output); - if (base->renderer_state != NULL) - pixman_renderer_output_destroy(base); - return 0; }