Fix CDDA and a corner-case in playlist handling

[vlc] / src / playlist / engine.c

diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index 8be880dd37b05a5dcc15633414bbdb3293e911c0..a094dbb42616520f813773a28884d00d91c7ac59 100644 (file)
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -231,6 +231,8 @@ void playlist_MainLoop( playlist_t *p_playlist )
                 & PLAYLIST_REMOVE_FLAG )
             {
                  playlist_ItemDelete( p_playlist->status.p_item );
+                 if( p_playlist->request.p_item == p_playlist->status.p_item )
+                     p_playlist->request.p_item = NULL;
                  p_playlist->status.p_item = NULL;
             }