Commit 2606ef55 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Do not use b_die directly, and simplify

parent a3069143
...@@ -487,13 +487,10 @@ void playlist_PreparseLoop( playlist_preparse_t *p_obj ) ...@@ -487,13 +487,10 @@ void playlist_PreparseLoop( playlist_preparse_t *p_obj )
while( vlc_object_alive( p_obj ) ) while( vlc_object_alive( p_obj ) )
{ {
while( p_obj->i_waiting == 0 ) if( p_obj->i_waiting == 0 )
{ {
if( vlc_object_wait( p_obj ) || p_playlist->b_die ) vlc_object_wait( p_obj );
{ continue;
vlc_object_unlock( p_obj );
return;
}
} }
p_current = p_obj->pp_waiting[0]; p_current = p_obj->pp_waiting[0];
...@@ -579,13 +576,10 @@ void playlist_FetcherLoop( playlist_fetcher_t *p_obj ) ...@@ -579,13 +576,10 @@ void playlist_FetcherLoop( playlist_fetcher_t *p_obj )
while( vlc_object_alive( p_obj ) ) while( vlc_object_alive( p_obj ) )
{ {
while( p_obj->i_waiting == 0 ) if( p_obj->i_waiting == 0 )
{ {
if( vlc_object_wait( p_obj ) || p_playlist->b_die ) vlc_object_wait( p_obj );
{ continue;
vlc_mutex_unlock( &p_obj->object_lock );
return;
}
} }
p_item = p_obj->pp_waiting[0]; p_item = p_obj->pp_waiting[0];
......
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