Commit 248d9c52 authored by Damien Fouilleul's avatar Damien Fouilleul

playlist.c: removed potential deadlock and duplicate signalling

parent 7f3af96e
......@@ -334,14 +334,14 @@ check_input:
if( p_item == NULL )
{
msg_Dbg( p_playlist, "nothing to play" );
p_playlist->status.i_status = PLAYLIST_STOPPED;
PL_UNLOCK
if( b_playexit == VLC_TRUE )
{
msg_Info( p_playlist, "end of playlist, exiting" );
vlc_object_kill( p_playlist->p_libvlc );
}
p_playlist->status.i_status = PLAYLIST_STOPPED;
PL_UNLOCK
ObjectGarbageCollector( p_playlist, VLC_TRUE );
return;
}
......
......@@ -138,7 +138,6 @@ int playlist_ThreadDestroy( playlist_t * p_playlist )
{
// Tell playlist to go to last loop
vlc_object_kill( p_playlist );
playlist_Signal( p_playlist );
// Kill preparser
if( p_playlist->p_preparse )
......
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