commit 993e2965616d560e76811ebee7f082d272aadd2d
author Roland Jon <rlandjon@gmail.com> Mon Jul 02 19:09:19 2018 +0800
committer Tim-Philipp Müller <tim@centricular.com> Wed Jul 18 16:47:21 2018 +0100
tree 2dedd1aaf4f0269c2b6cedc5ace075d854574ff2
parent 1796b224b8938bf04fbfb077d04119e9ebfed08f

player: Avoid trying to join the player thread from itself

https://bugzilla.gnome.org/show_bug.cgi?id=796731

gst-libs/gst/player/gstplayer.c

diff --git a/gst-libs/gst/player/gstplayer.c b/gst-libs/gst/player/gstplayer.c
index 5dd340a..5ab9e03 100644
--- a/gst-libs/gst/player/gstplayer.c
+++ b/gst-libs/gst/player/gstplayer.c
@@ -492,7 +492,10 @@
   if (self->loop) {
     g_main_loop_quit (self->loop);
 
-    g_thread_join (self->thread);
+    if (self->thread != g_thread_self ())
+      g_thread_join (self->thread);
+    else
+      g_thread_unref (self->thread);
     self->thread = NULL;
 
     g_main_loop_unref (self->loop);