playlist: only make The Playlist flat, not Media Library

diff --git a/src/playlist/item.c b/src/playlist/item.c
index 3b639de5e357c0aced413412db0b11d59f1d4301..686f0f4ae629e26d77ef0d48d2dc4179bbc8ad34 100644 (file)
--- a/src/playlist/item.c
+++ b/src/playlist/item.c
@@ -82,8 +82,7 @@ static void input_item_add_subitem_tree ( const vlc_event_t * p_event,
     playlist_item_t *p_up = p_item;
     while( p_up->p_parent )
     {
-        if( p_up->p_parent == p_playlist->p_playing ||
-            p_up->p_parent == p_playlist->p_media_library )
+        if( p_up->p_parent == p_playlist->p_playing )
         {
             if( !pl_priv(p_playlist)->b_tree ) b_flat = true;
             break;
@@ -104,7 +103,7 @@ static void input_item_add_subitem_tree ( const vlc_event_t * p_event,
 
     if( b_current )
     {
-        if( b_stop || !b_autostart )
+        if( ( b_stop && !b_flat ) || !b_autostart )
         {
             PL_UNLOCK;
             playlist_Stop( p_playlist );

diff --git a/src/playlist/loadsave.c b/src/playlist/loadsave.c
index 968105833636c9756fb02b023ac3a3e7d898c14b..4a6b0bc38db634e1669fcbcf4e47b3927876ba34 100644 (file)
--- a/src/playlist/loadsave.c
+++ b/src/playlist/loadsave.c
@@ -112,7 +112,7 @@ static void input_item_subitem_tree_added( const vlc_event_t * p_event,
 
     PL_LOCK;
     playlist_InsertInputItemTree ( p_playlist, p_playlist->p_media_library,
-                                   p_root, 0, !pl_priv(p_playlist)->b_tree );
+                                   p_root, 0, false );
     PL_UNLOCK;
 }