[vlc-devel] commit: Fixed signal and input release order. (Laurent Aimar )

git version control git at videolan.org
Mon Jan 5 21:26:46 CET 2009


vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sat Dec 27 12:26:25 2008 +0100| [9decc181d3ead4ae2bb8f5a18f24e85407127668] | committer: Laurent Aimar 

Fixed signal and input release order.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9decc181d3ead4ae2bb8f5a18f24e85407127668
---

 modules/gui/qt4/input_manager.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index 2882074..7d3d53b 100644
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -776,9 +776,9 @@ MainInputManager::~MainInputManager()
 {
     if( p_input )
     {
+       emit inputChanged( NULL );
        var_DelCallback( p_input, "state", PLItemChanged, this );
        vlc_object_release( p_input );
-       emit inputChanged( NULL );
     }
 
     var_DelCallback( p_intf->p_libvlc, "volume-change", VolumeChanged, this );
@@ -808,9 +808,9 @@ 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( NULL );
             var_DelCallback( p_input, "state", PLItemChanged, this );
             vlc_object_release( p_input );
-            emit inputChanged( NULL );
             p_input = NULL;
             vlc_mutex_unlock( &p_intf->change_lock );
             return;




More information about the vlc-devel mailing list