From: Pierre d'Herbemont <pdherbemont@videolan.org>
Date: Fri, 17 Aug 2007 08:00:03 +0000 (+0000)
Subject: src/playlist/item.c: Avoid a dead lock.
X-Git-Tag: 0.9.0-test0~6460
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=0bb627da208c7b28d2359eb69e2e39c8b04a4767;p=vlc

src/playlist/item.c: Avoid a dead lock.
---

diff --git a/src/playlist/item.c b/src/playlist/item.c
index 4e14c26b42..31eaf8bc6a 100644
--- a/src/playlist/item.c
+++ b/src/playlist/item.c
@@ -417,7 +417,10 @@ playlist_item_t *playlist_ItemToNode( playlist_t *p_playlist,
         ChangeToNode( p_playlist, p_item_in_category );
 
         if( !p_item_in_one )
+        {
+            if( !b_locked ) PL_UNLOCK;
             return p_item_in_category;
+        }
 
         /* Item in one is a root, change it to node */
         if( p_item_in_one->p_parent == p_playlist->p_root_onelevel )