Commit 59b66be9 authored by Erwan Tulou's avatar Erwan Tulou Committed by Rémi Denis-Courmont

qt4-correct several problems related to p_input (main input manager class)

Signed-off-by: Rémi Denis-Courmont's avatarRémi Denis-Courmont <remi@remlab.net>
parent 740270db
......@@ -942,7 +942,7 @@ void MainInputManager::customEvent( QEvent *event )
vlc_mutex_lock( &p_intf->change_lock );
if( p_input && ( p_input->b_dead || !vlc_object_alive (p_input) ) )
{
emit inputChanged( p_input );
emit inputChanged( NULL );
var_DelCallback( p_input, "state", PLItemChanged, this );
vlc_object_release( p_input );
p_input = NULL;
......@@ -963,13 +963,18 @@ void MainInputManager::customEvent( QEvent *event )
}
else
{
/* remove previous stored p_input */
if( p_input )
{
vlc_object_release( p_input );
p_input = NULL;
}
/* we are working as a dialogs provider */
playlist_t *p_playlist = pl_Hold( p_intf );
p_input = playlist_CurrentInput( p_playlist );
if( p_input )
{
emit inputChanged( p_input );
vlc_object_release( p_input );
}
pl_Release( p_intf );
}
......
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