X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Fitem.c;h=9f2b7bf91dc595a4eefd53409e6a703ded080adf;hb=c35e504a57cead20266b1c37b137a3ad98c3d1cd;hp=8213308fbb247a92ebb153e62e678004e262fd93;hpb=f5b52a214d4053b3e4b6c26e9371f9c89f692d42;p=vlc diff --git a/src/playlist/item.c b/src/playlist/item.c index 8213308fbb..9f2b7bf91d 100644 --- a/src/playlist/item.c +++ b/src/playlist/item.c @@ -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 );