From 59b66be9b1ea3b3f2976f29cde4a0ee3932abf1a Mon Sep 17 00:00:00 2001 From: Erwan Tulou Date: Fri, 13 Mar 2009 20:10:18 +0100 Subject: [PATCH] qt4-correct several problems related to p_input (main input manager class) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Rémi Denis-Courmont --- modules/gui/qt4/input_manager.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp index 929865809e..13149bd6a7 100644 --- a/modules/gui/qt4/input_manager.cpp +++ b/modules/gui/qt4/input_manager.cpp @@ -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 ); } -- 2.39.2