[vlc-devel] commit: Fix #2720: when deleting the current playing item we must ask the playlist to ( Rémi Duraffort )

[git version control]

vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Tue Jun 16 11:38:23 2009 +0200| [eb1d3fb0637506860ab94d22942a83a46b342ce6] | committer: Rémi Duraffort 

Fix #2720: when deleting the current playing item we must ask the playlist to
reset the current status item.
(cherry picked from commit 6d28f6deddc7596b7d0a6c0236e7ef81f4cacc07)

Signed-off-by: Rémi Duraffort <ivoire at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=eb1d3fb0637506860ab94d22942a83a46b342ce6
---

 src/playlist/item.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/playlist/item.c b/src/playlist/item.c
index 9210971..b95fc42 100644
--- 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 );