Fix crash on delete (Refs:#205)

diff --git a/src/playlist/item-ext.c b/src/playlist/item-ext.c
index f2087be59b7acb631b10bd6698f528d83ca4c079..20466aafafe66a7ebd853d1fb94a8bd032dd6829 100644 (file)
--- a/src/playlist/item-ext.c
+++ b/src/playlist/item-ext.c
@@ -663,6 +663,7 @@ int playlist_Delete( playlist_t * p_playlist, int i_id )
         /* Hack we don't call playlist_Control for lock reasons */
         p_playlist->status.i_status = PLAYLIST_STOPPED;
         p_playlist->request.b_request = VLC_TRUE;
+        p_playlist->request.p_item = NULL;
         msg_Info( p_playlist, "stopping playback" );
         b_flag = VLC_TRUE;
     }

diff --git a/src/playlist/playlist.c b/src/playlist/playlist.c
index 1c667fdf788595c7491301733664a6f47afb4477..3cf0539d73230579cd133e140f797ca2a259a9c6 100644 (file)
--- a/src/playlist/playlist.c
+++ b/src/playlist/playlist.c
@@ -866,7 +866,7 @@ static playlist_item_t * NextItem( playlist_t *p_playlist )
             i_skip = p_playlist->request.i_skip;
             i_goto = p_playlist->request.i_goto;
 
-            if( p_playlist->i_index == -1 ) p_playlist->i_index = 0;
+            if( p_playlist->i_index < 0 ) p_playlist->i_index = 0;
             p_new = p_playlist->pp_items[p_playlist->i_index];
 
             if( i_goto >= 0  && i_goto < p_playlist->i_size )