Changeset 24298341eb3b322f6f4eba55ff8b58399890c72e

Timestamp:

06/07/08 15:46:16 (5 months ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

Pierre d'Herbemont <pdherbemont@videolan.org> 1215351976 +0200

git-parent:

[c8759b8d6ca419b3bc6f157da5eae0093a145435]

git-author:

Pierre d'Herbemont <pdherbemont@videolan.org> 1215341164 +0200

Message:

playlist: Make sure we don't crash when we delete the currently playing node.

Files:

• src/playlist/control.c (modified) (1 diff)
• src/playlist/engine.c (modified) (1 diff)
• src/playlist/tree.c (modified) (1 diff)

src/playlist/control.c

@@ -374 +374 @@
-                        PLI_NAME( p_playlist->request.p_node ), i_skip );
-
+        /* Make sure the node wasn't deleted */
+        if( p_playlist->status.p_node &&
+            p_playlist->status.p_node->i_flags & PLAYLIST_REMOVE_FLAG )
+        {
+             PL_DEBUG( "%s was marked for deletion, deleting",
+                             PLI_NAME( p_playlist->status.p_node  ) );
+             playlist_ItemDelete( p_playlist->status.p_node );
+             /* Don't attempt to reuse that node */
+             if( p_playlist->status.p_node == p_playlist->request.p_node )
+                p_playlist->request.p_node = NULL;
+             p_playlist->status.p_node = NULL;
+        }
+
-        if( p_playlist->request.p_node &&
-            p_playlist->request.p_node != p_playlist->status.p_node )
-        {
+
-            p_playlist->status.p_node = p_playlist->request.p_node;
-            p_playlist->b_reset_currently_playing = true;

src/playlist/engine.c

@@ -477 +477 @@
-        sout_DeleteInstance( p_sout );
-#endif
+
+    if( p_playlist->status.p_node &&
+        p_playlist->status.p_node->i_flags & PLAYLIST_REMOVE_FLAG )
+    {
+         PL_DEBUG( "%s was marked for deletion, deleting",
+                         PLI_NAME( p_playlist->status.p_node  ) );
+         playlist_ItemDelete( p_playlist->status.p_node );
+         p_playlist->status.p_node = NULL;
+    }
-
-    /* Core should have terminated all SDs before the playlist */

src/playlist/tree.c

@@ -172 +172 @@
-            playlist_NodeRemoveItem( p_playlist, p_root, p_root->p_parent );
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    return VLC_SUCCESS;