[vlc-commits] playlist/item: do not stop playback on empty node

[Filip Roséen]

vlc | branch: master | Filip Roséen <filip at atch.se> | Thu May 18 12:01:16 2017 +0200| [6f63de13746b52bffc387426729e96e5f82f1ce9] | committer: Rémi Denis-Courmont

playlist/item: do not stop playback on empty node

fixes: #17352

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

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

 src/playlist/item.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/playlist/item.c b/src/playlist/item.c
index 4df3c3f0d2..c2ea664a7d 100644
--- a/src/playlist/item.c
+++ b/src/playlist/item.c
@@ -163,15 +163,11 @@ static void input_item_add_subitem_tree ( const vlc_event_t * p_event,
     //control playback only if it was the current playing item that got subitems
     if( b_current )
     {
-        if( last_pos == pos || ( b_stop && !b_flat ) || !b_autostart )
+        if( ( b_stop && !b_flat ) || !b_autostart )
         {
-            /* We stop, either because no sub-item was actually created, or some
-            flags/settings want us to do so at this point */
-            PL_UNLOCK;
             playlist_Stop( p_playlist );
-            return;
         }
-        else
+        else if( last_pos != pos ) /* any children? */
         {
             /* Continue to play, either random or the first new item */
             playlist_item_t *p_play_item;