Playlist: join safely

diff --git a/src/libvlc.c b/src/libvlc.c
index 73eed932703d63f3eb3d0d9c91de6b35af56debd..f31f150d5f879a0974aaa826822a67ba86b5ad88 100644 (file)
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -960,6 +960,8 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
 
     /* Free playlist */
     msg_Dbg( p_libvlc, "removing playlist" );
+    vlc_object_kill( priv->p_playlist );
+    vlc_thread_join( priv->p_playlist );
     vlc_object_release( priv->p_playlist );
 
     /* Free interaction */