Fix #2720 for master also. Finally that's not an hack as the code is build to

[vlc] / src / playlist / item.c

diff --git a/src/playlist/item.c b/src/playlist/item.c
index 9210971ccba44b753bc233901ccbbc4eceaa4764..b95fc423beee8fc8ab1c609bf169bfa357905920 100644 (file)
--- a/src/playlist/item.c
+++ b/src/playlist/item.c
@@ -900,10 +900,16 @@ static int DeleteInner( playlist_t * p_playlist, playlist_item_t *p_item,
         ARRAY_REMOVE( p_playlist->items, i );
 
     /* Check if it is the current item */
-    if( get_current_status_item( p_playlist ) == p_item && b_stop )
+    if( get_current_status_item( p_playlist ) == p_item )
     {
-        playlist_Control( p_playlist, PLAYLIST_STOP, pl_Locked );
-        msg_Info( p_playlist, "stopping playback" );
+        /* Stop it if we have to */
+        if( b_stop )
+        {
+            playlist_Control( p_playlist, PLAYLIST_STOP, pl_Locked );
+            msg_Info( p_playlist, "stopping playback" );
+        }
+        /* In any case, this item can't be the next one to be played ! */
+        set_current_status_item( p_playlist, NULL );
     }
 
     PL_DEBUG( "deleting item `%s'", p_item->p_input->psz_name );