Skip to content

V
vlc-2-2
Commit 54a51559 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont
Browse files
Options

playlist: Don't accept more items when if preparser is dead.

parent 1f1e1106
Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 0 deletions
src/playlist/control.c
View file @ 54a51559
......@@ -181,6 +181,11 @@ int playlist_PreparseEnqueue( playlist_t *p_playlist,
input_item_t *p_item )
{
vlc_object_lock( p_playlist->p_preparse );
if( !vlc_object_alive( p_playlist->p_preparse ) )
{
vlc_object_unlock( p_playlist->p_preparse );
return VLC_EGENERIC;
}
vlc_gc_incref( p_item );
INSERT_ELEM( p_playlist->p_preparse->pp_waiting,
p_playlist->p_preparse->i_waiting,
......@@ -198,6 +203,12 @@ int playlist_PreparseEnqueueItem( playlist_t *p_playlist,
{
vlc_object_lock( p_playlist );
vlc_object_lock( p_playlist->p_preparse );
if( !vlc_object_alive( p_playlist->p_preparse ) )
{
vlc_object_unlock( p_playlist->p_preparse );
vlc_object_unlock( p_playlist );
return VLC_EGENERIC;
}
PreparseEnqueueItemSub( p_playlist, p_item );
vlc_object_unlock( p_playlist->p_preparse );
vlc_object_unlock( p_playlist );
......@@ -210,6 +221,12 @@ int playlist_AskForArtEnqueue( playlist_t *p_playlist,
int i;
vlc_object_lock( p_playlist->p_fetcher );
if( !vlc_object_alive( p_playlist->p_fetcher ) )
{
vlc_object_unlock( p_playlist->p_fetcher );
return VLC_EGENERIC;
}
for( i = 0; i < p_playlist->p_fetcher->i_waiting ; i++ );
vlc_gc_incref( p_item );
INSERT_ELEM( p_playlist->p_fetcher->pp_waiting,
......
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