[vlc-commits] playlist/item: input_item_add_subitem_tree: do not try to lock already locked playlist

[Filip Roséen]

vlc | branch: master | Filip Roséen <filip at atch.se> | Thu May 18 20:14:25 2017 +0200| [c1f04fba2fefd3202e7feb5b0203b90a8fcacc6b] | committer: Rémi Denis-Courmont

playlist/item: input_item_add_subitem_tree: do not try to lock already locked playlist

This is a fixup of 6f63de1, which accidentally resulted in the
implementation trying to acquire an already acquired mutex.

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c1f04fba2fefd3202e7feb5b0203b90a8fcacc6b
---

 src/playlist/item.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/playlist/item.c b/src/playlist/item.c
index c2ea664a7d..5616ad2181 100644
--- a/src/playlist/item.c
+++ b/src/playlist/item.c
@@ -165,7 +165,7 @@ static void input_item_add_subitem_tree ( const vlc_event_t * p_event,
     {
         if( ( b_stop && !b_flat ) || !b_autostart )
         {
-            playlist_Stop( p_playlist );
+            playlist_Control( p_playlist, PLAYLIST_STOP, pl_Locked );
         }
         else if( last_pos != pos ) /* any children? */
         {