plqylist: Delete current playing item, if qpplicable, inside the PL_LOCK, and at...

diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index 43340c9d8e1853ad47f685574717212e9d425d15..5a6a90e7fc381e8806d246ac0c28738c0e1db450 100644 (file)
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -482,6 +482,18 @@ void playlist_LastLoop( playlist_t *p_playlist )
         sout_DeleteInstance( p_sout );
 #endif
 
+    /* Core should have terminated all SDs before the playlist */
+    /* TODO: It fails to do so when not playing anything -- Courmisch */
+    playlist_ServicesDiscoveryKillAll( p_playlist );
+    playlist_MLDump( p_playlist );
+
+    vlc_object_kill( p_playlist->p_preparse );
+    vlc_thread_join( p_playlist->p_preparse );
+    vlc_object_kill( p_playlist->p_fetcher );
+    vlc_thread_join( p_playlist->p_fetcher );
+
+    PL_LOCK;
+
     if( p_playlist->status.p_node &&
         p_playlist->status.p_node->i_flags & PLAYLIST_REMOVE_FLAG )
     {
@@ -499,17 +511,6 @@ void playlist_LastLoop( playlist_t *p_playlist )
          p_playlist->status.p_item = NULL;
     }
 
-    /* Core should have terminated all SDs before the playlist */
-    /* TODO: It fails to do so when not playing anything -- Courmisch */
-    playlist_ServicesDiscoveryKillAll( p_playlist );
-    playlist_MLDump( p_playlist );
-
-    vlc_object_kill( p_playlist->p_preparse );
-    vlc_thread_join( p_playlist->p_preparse );
-    vlc_object_kill( p_playlist->p_fetcher );
-    vlc_thread_join( p_playlist->p_fetcher );
-
-    PL_LOCK;
     FOREACH_ARRAY( playlist_item_t *p_del, p_playlist->all_items )
         free( p_del->pp_children );
         vlc_gc_decref( p_del->p_input );