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

playlist: set "input-current" to NULL when appropriate

parent 3c2c9364
......@@ -223,10 +223,10 @@ static void PlayItem( playlist_t *p_playlist, playlist_item_t *p_item )
vlc_object_release( p_input_thread );
p_input_thread = NULL;
}
else
var_SetAddress( p_playlist, "input-current", p_input_thread );
}
var_SetAddress( p_playlist, "input-current", p_input_thread );
/* TODO store art policy in playlist private data */
char *psz_arturl = input_item_GetArtURL( p_input );
/* p_input->p_meta should not be null after a successful CreateThread */
......@@ -446,6 +446,8 @@ static void LoopInput( playlist_t *p_playlist )
PL_DEBUG( "dead input" );
PL_UNLOCK;
var_SetAddress( p_playlist, "input-current", NULL );
/* WARNING: Input resource manipulation and callback deletion are
* incompatible with the playlist lock. */
if( !var_InheritBool( p_input, "sout-keep" ) )
......
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