threads: Make sure we vlc_thread_join() won't block when run from joined thread using...

Signed-off-by: Rémi Denis-Courmont

diff --git a/src/misc/threads.c b/src/misc/threads.c
index 23dcf71191b2283df31413226f387554f6e0b945..633e0634c23d0a5c37e4067909a5beaf92b5336f 100644 (file)
--- a/src/misc/threads.c
+++ b/src/misc/threads.c
@@ -834,8 +834,12 @@ void __vlc_thread_join( vlc_object_t *p_this, const char * psz_file, int i_line
     i_ret = (B_OK == wait_for_thread( p_priv->thread_id, &exit_value ));
 
 #elif defined( LIBVLC_USE_PTHREAD )
-    i_ret = pthread_join( p_priv->thread_id, NULL );
-
+    /* Make sure we do return if we are calling vlc_thread_join()
+     * from the joined thread */
+    if (pthread_equal (pthread_self (), p_priv->thread_id))
+        i_ret = pthread_detach (p_priv->thread_id);
+    else
+        i_ret = pthread_join (p_priv->thread_id, NULL);
 #endif
 
     if( i_ret )