Don't only play the playlist in playlist demuxers (Closes #84)

diff --git a/modules/demux/playlist/b4s.c b/modules/demux/playlist/b4s.c
index 01a4d82c563d13df24fe7f7357ff56149d0f968f..01b98a52079e36f432479b6b934cd32dc4d7cb0e 100644 (file)
--- a/modules/demux/playlist/b4s.c
+++ b/modules/demux/playlist/b4s.c
@@ -391,11 +391,13 @@ static int Demux( demux_t *p_demux )
     }
 
     /* Go back and play the playlist */
-    if( b_play )
+    if( b_play && p_playlist->status.p_item &&
+        p_playlist->status.p_item->i_children > 0 )
     {
         playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,
                           p_playlist->status.i_view,
-                          p_playlist->status.p_item, NULL );
+                          p_playlist->status.p_item,
+                          p_playlist->status.p_item->pp_children[0] );
     }
     
     vlc_object_release( p_playlist );

diff --git a/modules/demux/playlist/m3u.c b/modules/demux/playlist/m3u.c
index a0c688d6799512e2c2d4546c94010b43dc881178..e20b0d8ec27b94036730f7c045e2c0152cf22833 100644 (file)
--- a/modules/demux/playlist/m3u.c
+++ b/modules/demux/playlist/m3u.c
@@ -243,11 +243,13 @@ static int Demux( demux_t *p_demux )
     }
 
     /* Go back and play the playlist */
-    if( b_play )
+    if( b_play && p_playlist->status.p_item &&
+        p_playlist->status.p_item->i_children > 0 )
     {
         playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,
                           p_playlist->status.i_view,
-                          p_playlist->status.p_item, NULL );
+                          p_playlist->status.p_item,
+                          p_playlist->status.p_item->pp_children[0] );
     }
 
     vlc_object_release( p_playlist );

diff --git a/modules/demux/playlist/pls.c b/modules/demux/playlist/pls.c
index 4b9e56e31e12fdf85f276aa5f0e70c716760e8fd..eb566dfefa01e23037cabc808b664b3fb84f69cf 100644 (file)
--- a/modules/demux/playlist/pls.c
+++ b/modules/demux/playlist/pls.c
@@ -272,11 +272,13 @@ static int Demux( demux_t *p_demux )
         psz_name = NULL;
     }
 
-    if( b_play )
+    if( b_play && p_playlist->status.p_item &&
+        p_playlist->status.p_item->i_children > 0 )
     {
         playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,
                           p_playlist->status.i_view,
-                          p_playlist->status.p_item, NULL );
+                          p_playlist->status.p_item,
+                          p_playlist->status.p_item->pp_children[0] );
     }
     vlc_object_release( p_playlist );
     return VLC_SUCCESS;