Honor don't skip flag for items too

diff --git a/modules/misc/sap.c b/modules/misc/sap.c
index cf32236e7c59f17b4076ab9a0422f050b59b451c..31aa541c1115a1d0128bc0c75b44a2d9430a6eff 100644 (file)
--- a/modules/misc/sap.c
+++ b/modules/misc/sap.c
@@ -600,8 +600,6 @@ static int ParseSAP( intf_thread_t *p_intf, uint8_t *p_buffer, int i_read )
         psz_sdp++;
     }
 
-    fprintf(stderr,"\n\n%s\n\n", psz_sdp);
-
     /* Parse SDP info */
     p_sdp = ParseSDP( VLC_OBJECT(p_intf), psz_sdp );
 

diff --git a/src/playlist/playlist.c b/src/playlist/playlist.c
index 6c4acec62de58b2d5cc531baae9dcb3bd82f8485..bbda0104a08689ba10d33408969c12d19533f5dc 100644 (file)
--- a/src/playlist/playlist.c
+++ b/src/playlist/playlist.c
@@ -674,6 +674,13 @@ static playlist_item_t * NextItem( playlist_t *p_playlist )
         return NULL;
     }
 
+    if( !p_playlist->request.b_request &&
+        !(p_playlist->status.p_item->i_flags & PLAYLIST_SKIP_FLAG) )
+    {
+        msg_Dbg( p_playlist, "no-skip mode, stopping") ;
+        return NULL;
+    }
+
     /* TODO: improve this (only use current node) */
     /* TODO: use the "shuffled view" internally ? */
     /* Random case. This is an exception: if request, but request is skip +- 1