From 2776cef25d2a98668b73272aecfe77e684e6627e Mon Sep 17 00:00:00 2001 From: Vincent Penquerc'h Date: Mon, 15 Aug 2016 16:14:25 +0100 Subject: glcontext: fix race joining thread on finalize https://bugzilla.gnome.org/show_bug.cgi?id=769939 --- gst-libs/gst/gl/gstglcontext.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gst-libs/gst') diff --git a/gst-libs/gst/gl/gstglcontext.c b/gst-libs/gst/gl/gstglcontext.c index d222e086c..2bc0a780a 100644 --- a/gst-libs/gst/gl/gstglcontext.c +++ b/gst-libs/gst/gl/gstglcontext.c @@ -642,7 +642,14 @@ gst_gl_context_finalize (GObject * object) gst_gl_window_quit (context->window); GST_INFO_OBJECT (context, "joining gl thread"); - g_thread_join (context->priv->gl_thread); + g_mutex_lock (&context->priv->render_lock); + if (context->priv->alive) { + GThread *t = context->priv->gl_thread; + g_mutex_unlock (&context->priv->render_lock); + g_thread_join (t); + } else { + g_mutex_unlock (&context->priv->render_lock); + } GST_INFO_OBJECT (context, "gl thread joined"); context->priv->gl_thread = NULL; } -- cgit v1.2.1