]> git.sesse.net Git - vlc/commitdiff
core playlist: fix my mistake in [4eff56920]
authorJakob Leben <jleben@videolan.org>
Tue, 15 Jun 2010 08:44:42 +0000 (10:44 +0200)
committerJakob Leben <jleben@videolan.org>
Tue, 15 Jun 2010 08:50:17 +0000 (10:50 +0200)
src/playlist/item.c

index 8213308fbb247a92ebb153e62e678004e262fd93..9f2b7bf91dc595a4eefd53409e6a703ded080adf 100644 (file)
@@ -821,9 +821,6 @@ static int RecursiveAddIntoParent (
           if( !p_new_item ) return i_pos;
 
           i_pos++;
-
-          //Swap parent for new item, if we will recurse
-          if( b_children ) p_parent = p_new_item;
       }
       //Recurse if any children
       if( b_children )
@@ -831,7 +828,9 @@ static int RecursiveAddIntoParent (
           //Substitute p_new_item for first child leaf
           //(If flat, continue counting from current position)
           int i_last_pos = RecursiveAddIntoParent(
-                                      p_playlist, p_parent, p_child_node,
+                                      p_playlist,
+                                      p_new_item ? p_new_item : p_parent,
+                                      p_child_node,
                                       ( b_flat ? i_pos : 0 ),
                                       b_flat,
                                       &p_new_item );