From a9112ffe2d77740c9a84e7bece37412f2a0a5ab2 Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Wed, 16 Mar 2016 22:19:25 +1100 Subject: wayland: fix null pointer dereference on error gnome-shell doesn't the support wl_scaler interface which makes creating a wayland display fail creation. Found in the generic state changes test --- ext/wayland/wldisplay.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ext/wayland/wldisplay.c b/ext/wayland/wldisplay.c index 8c5eeaf9a..758614b71 100644 --- a/ext/wayland/wldisplay.c +++ b/ext/wayland/wldisplay.c @@ -56,7 +56,8 @@ gst_wl_display_finalize (GObject * gobject) GstWlDisplay *self = GST_WL_DISPLAY (gobject); gst_poll_set_flushing (self->wl_fd_poll, TRUE); - g_thread_join (self->thread); + if (self->thread) + g_thread_join (self->thread); /* to avoid buffers being unregistered from another thread * at the same time, take their ownership */ -- cgit v1.2.1