playlist: Fix a warning about an unitialized ptr.

[vlc] / src / playlist / tree.c

diff --git a/src/playlist/tree.c b/src/playlist/tree.c
index 49d077630747ce9a497231f72a14e5cae80e4cf0..3b583ee7ad8f2f7016ccb33babe08296da62ef0c 100644 (file)
--- a/src/playlist/tree.c
+++ b/src/playlist/tree.c
@@ -24,7 +24,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <assert.h>
 #include "vlc_playlist.h"
 #include "playlist_internal.h"
@@ -59,7 +59,7 @@ playlist_item_t * playlist_NodeCreate( playlist_t *p_playlist,
                                        playlist_item_t *p_parent, int i_flags,
                                        input_item_t *p_input )
 {
-    input_item_t *p_new_input;
+    input_item_t *p_new_input = NULL;
     playlist_item_t *p_item;
 
     if( !psz_name ) psz_name = _("Undefined");
@@ -69,7 +69,7 @@ playlist_item_t * playlist_NodeCreate( playlist_t *p_playlist,
                                         psz_name, 0, NULL, -1, ITEM_TYPE_NODE );
     p_item = playlist_ItemNewFromInput( VLC_OBJECT(p_playlist),
                                         p_input ? p_input : p_new_input );
-    if( !p_input )
+    if( p_new_input )
         vlc_gc_decref( p_new_input );
 
     if( p_item == NULL )  return NULL;
@@ -171,7 +171,24 @@ int playlist_NodeDelete( playlist_t *p_playlist, playlist_item_t *p_root,
         if( p_root->p_parent )
             playlist_NodeRemoveItem( p_playlist, p_root, p_root->p_parent );
 
-        playlist_ItemDelete( p_root );
+        /* Check if it is the current node */
+        if( p_playlist->status.p_node == p_root )
+        {
+            /* Hack we don't call playlist_Control for lock reasons */
+            p_playlist->request.i_status = PLAYLIST_STOPPED;
+            p_playlist->request.b_request = true;
+            p_playlist->request.p_item = NULL;
+            p_playlist->request.p_node = NULL;
+            msg_Info( p_playlist, "stopping playback" );
+            vlc_object_signal_maybe( VLC_OBJECT(p_playlist) );
+
+            PL_DEBUG( "marking %s for further deletion", PLI_NAME( p_root ) );
+            p_root->i_flags |= PLAYLIST_REMOVE_FLAG;
+        }
+        else
+            playlist_ItemDelete( p_root );
+
+
     }
     return VLC_SUCCESS;
 }
@@ -319,9 +336,6 @@ void playlist_NodesPairCreate( playlist_t *p_playlist, const char *psz_name,
 /**
  * Get the node in the preferred tree from a node in one of category
  * or onelevel tree.
- * For example, for the SAP node, it will return the node in the category
- * tree if --playlist-tree is not set to never, because the SAP node prefers
- * category
  */
 playlist_item_t * playlist_GetPreferredNode( playlist_t *p_playlist,
                                              playlist_item_t *p_node )
@@ -329,8 +343,8 @@ playlist_item_t * playlist_GetPreferredNode( playlist_t *p_playlist,
     int i;
     if( p_node->p_parent == p_playlist->p_root_category )
     {
-        if( p_playlist->b_always_tree ||
-            p_node->p_input->b_prefers_tree ) return p_node;
+        if( p_playlist->b_tree )
+            return p_node;
         for( i = 0 ; i< p_playlist->p_root_onelevel->i_children; i++ )
         {
             if( p_playlist->p_root_onelevel->pp_children[i]->p_input->i_id ==
@@ -340,7 +354,7 @@ playlist_item_t * playlist_GetPreferredNode( playlist_t *p_playlist,
     }
     else if( p_node->p_parent == p_playlist->p_root_onelevel )
     {
-        if( p_playlist->b_never_tree || !p_node->p_input->b_prefers_tree )
+        if( !p_playlist->b_tree )
             return p_node;
         for( i = 0 ; i< p_playlist->p_root_category->i_children; i++ )
         {