[vlc-devel] commit: qt4-correct several problems related to p_input ( main input manager class) (Erwan Tulou )
git version control
git at videolan.org
Sun Mar 15 19:59:09 CET 2009
vlc | branch: master | Erwan Tulou <brezhoneg1 at yahoo.fr> | Fri Mar 13 20:10:18 2009 +0100| [59b66be9b1ea3b3f2976f29cde4a0ee3932abf1a] | committer: Rémi Denis-Courmont
qt4-correct several problems related to p_input (main input manager class)
Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=59b66be9b1ea3b3f2976f29cde4a0ee3932abf1a
---
modules/gui/qt4/input_manager.cpp | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index 9298658..13149bd 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 );
}
More information about the vlc-devel
mailing list