mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-03 13:16:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

glcontext: fix race joining thread on finalize

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=769939
This commit is contained in:
Vincent Penquerc'h 2016-08-15 16:14:25 +01:00 committed by Matthew Waters
parent 117f81dc00
commit 2776cef25d
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gst-libs/gst/gl/gstglcontext.c
View file

@ -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;
}