[vlc-commits] commit: core playlist: fix my mistake in [4eff56920] (Jakob Leben )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Jakob Leben <jleben at videolan.org> | Tue Jun 15 10:44:42 2010 +0200| [b9a8c6fcf3ce533546fbf12541faac517b64cbd4] | committer: Jakob Leben 

core playlist: fix my mistake in [4eff56920]

Applied from c35e504a57cead20266b1c37b137a3ad98c3d1cd

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

 src/playlist/item.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/playlist/item.c b/src/playlist/item.c
index 8213308..9f2b7bf 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 );