Commit da01154c authored by Jean-Paul Saman's avatar Jean-Paul Saman

Don't abort when nothing found in playlist.

parent 6906a7c0
...@@ -75,6 +75,8 @@ static int PlaylistVAControl( playlist_t * p_playlist, int i_query, va_list args ...@@ -75,6 +75,8 @@ static int PlaylistVAControl( playlist_t * p_playlist, int i_query, va_list args
{ {
p_node = p_playlist->status.p_node; p_node = p_playlist->status.p_node;
assert( p_node ); assert( p_node );
if( !p_node )
break;
} }
p_playlist->request.i_status = PLAYLIST_RUNNING; p_playlist->request.i_status = PLAYLIST_RUNNING;
p_playlist->request.i_skip = 0; p_playlist->request.i_skip = 0;
......
...@@ -594,7 +594,8 @@ void playlist_FetcherLoop( playlist_fetcher_t *p_obj ) ...@@ -594,7 +594,8 @@ void playlist_FetcherLoop( playlist_fetcher_t *p_obj )
vlc_mutex_unlock( &p_obj->object_lock ); vlc_mutex_unlock( &p_obj->object_lock );
if( p_item ) if( p_item )
{ {
assert( p_item->p_meta ); if( !p_item->p_meta )
return;
if( !b_fetch_art ) if( !b_fetch_art )
{ {
input_MetaFetch( p_playlist, p_item ); input_MetaFetch( p_playlist, p_item );
......
...@@ -87,7 +87,8 @@ playlist_item_t * playlist_ItemGetByInputId( playlist_t *p_playlist, ...@@ -87,7 +87,8 @@ playlist_item_t * playlist_ItemGetByInputId( playlist_t *p_playlist,
playlist_item_t *p_root ) playlist_item_t *p_root )
{ {
int i; int i;
assert( p_root != NULL );
if( !p_root ) return NULL;
for( i = 0 ; i< p_root->i_children ; i++ ) for( i = 0 ; i< p_root->i_children ; i++ )
{ {
if( p_root->pp_children[i]->i_children == -1 && if( p_root->pp_children[i]->i_children == -1 &&
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment