Fix autoplayback with skins

diff --git a/src/playlist/playlist.c b/src/playlist/playlist.c
index 61fad2f854d4056671199e7e7c7da179588b54ea..26958b498737e0eb1b927674ac920cf1cc7eb73f 100644 (file)
--- a/src/playlist/playlist.c
+++ b/src/playlist/playlist.c
@@ -675,8 +675,7 @@ static playlist_item_t * NextItem( playlist_t *p_playlist )
     /* Nothing requested */
     if( !p_playlist->request.b_request && p_playlist->status.p_item == NULL )
     {
-        msg_Warn( p_playlist,"nothing requested" );
-        return NULL;
+        msg_Dbg( p_playlist,"nothing requested, starting" );
     }
 
     /* Repeat and play/stop */
@@ -692,7 +691,7 @@ static playlist_item_t * NextItem( playlist_t *p_playlist )
         return NULL;
     }
 
-    if( !p_playlist->request.b_request &&
+    if( !p_playlist->request.b_request && p_playlist->status.p_item && 
         !(p_playlist->status.p_item->i_flags & PLAYLIST_SKIP_FLAG) )
     {
         msg_Dbg( p_playlist, "no-skip mode, stopping") ;
@@ -818,7 +817,6 @@ static playlist_item_t * NextItem( playlist_t *p_playlist )
     {
         p_playlist->request_date = 0;
 
-
         if( p_playlist->status.i_view == -1 )
         {
             if( p_playlist->i_index + 1 < p_playlist->i_size )

diff --git a/src/playlist/view.c b/src/playlist/view.c
index a7e3b155f53701a24f4849a20cd25182f39b6a48..b1193f1009e91fbcd66d58b58ee55589454cb6a1 100644 (file)
--- a/src/playlist/view.c
+++ b/src/playlist/view.c
@@ -340,7 +340,7 @@ int playlist_NodeEmpty( playlist_t *p_playlist, playlist_item_t *p_root,
  * \return VLC_SUCCESS or an error
  */
 int playlist_NodeDelete( playlist_t *p_playlist, playlist_item_t *p_root,
-                        vlc_bool_t b_delete_items )
+                         vlc_bool_t b_delete_items )
 {
     int i;
     if( p_root->i_children == -1 )