From e6dec90e29a4d01b54b1a29143de88993f125397 Mon Sep 17 00:00:00 2001
From: Ryo Munakata <ryomnktml@gmail.com>
Date: Thu, 24 Nov 2016 19:05:07 +0900
Subject: [PATCH] compositor-x11: fix segfault when use_pixman is true

Signed-off-by: Ryo Munakata <ryomnktml@gmail.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
---
 libweston/compositor-x11.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libweston/compositor-x11.c b/libweston/compositor-x11.c
index de64e499..34ef8546 100644
--- a/libweston/compositor-x11.c
+++ b/libweston/compositor-x11.c
@@ -917,8 +917,9 @@ x11_output_enable(struct weston_output *base)
 			weston_log("Failed to create pixman renderer for output\n");
 			x11_output_deinit_shm(b, output);
 			goto err;
-		output->base.repaint = x11_output_repaint_shm;
 		}
+
+		output->base.repaint = x11_output_repaint_shm;
 	} else {
 		/* eglCreatePlatformWindowSurfaceEXT takes a Window*
 		 * but eglCreateWindowSurface takes a Window. */