From: Jakob Leben <jleben@videolan.org>
Date: Tue, 2 Feb 2010 06:35:37 +0000 (+0100)
Subject: playlist: restore stop and browse behavior like before
X-Git-Tag: 1.1.0-ff~552
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=8927c888dc51cd957ecbc1353b4ba6cfb9121455;p=vlc

playlist: restore stop and browse behavior like before
---

diff --git a/src/playlist/item.c b/src/playlist/item.c
index 48ee7bee89..17cacc12ba 100644
--- a/src/playlist/item.c
+++ b/src/playlist/item.c
@@ -100,8 +100,9 @@ static void input_item_add_subitem_tree ( const vlc_event_t * p_event,
         p_item = playlist_InsertInputItemTree( p_playlist, p_item,
                                                p_new_root, 0, false );
 
+    if( !b_flat ) var_SetAddress( p_playlist, "leaf-to-parent", p_input );
 
-    if( b_stop )
+    if( b_stop && !b_flat )
     {
         PL_UNLOCK;
         playlist_Stop( p_playlist );