summaryrefslogtreecommitdiff
path: root/src/compositor-rpi.c
diff options
context:
space:
mode:
authorDawid Gajownik <gajownik@gmail.com>2015-07-31 00:02:28 -0300
committerDaniel Stone <daniels@collabora.com>2015-08-06 16:11:09 +0100
commit82d4925b1a9de104050e4f9b610ce36d096e793f (patch)
treec722b8056794d0d04e9536629e4694fdd3f2e889 /src/compositor-rpi.c
parent405ae2febaa3f1a6de5bd0eb65d9a6a811040cc9 (diff)
downloadweston-82d4925b1a9de104050e4f9b610ce36d096e793f.tar.gz
backends: don't destroy renderer and output twice
drm, fbdev, rpi and wayland backends are unnecessarily destroying renderer and output before executing weston_compositor_shutdown() Signed-off-by: Dawid Gajownik <gajownik@gmail.com> Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
Diffstat (limited to 'src/compositor-rpi.c')
-rw-r--r--src/compositor-rpi.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/compositor-rpi.c b/src/compositor-rpi.c
index ac9faebc..602cbeec 100644
--- a/src/compositor-rpi.c
+++ b/src/compositor-rpi.c
@@ -522,20 +522,17 @@ rpi_backend_create(struct weston_compositor *compositor,
goto out_launcher;
if (rpi_output_create(backend, param->output_transform) < 0)
- goto out_renderer;
+ goto out_launcher;
if (udev_input_init(&backend->input,
compositor,
backend->udev, "seat0") != 0) {
weston_log("Failed to initialize udev input.\n");
- goto out_renderer;
+ goto out_launcher;
}
return backend;
-out_renderer:
- compositor->renderer->destroy(compositor);
-
out_launcher:
weston_launcher_destroy(compositor->launcher);