Skip to content

V
vlc-1.1
Commit 9decc181 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Fixed signal and input release order.

parent 74729214
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
modules/gui/qt4/input_manager.cpp
View file @ 9decc181
...@@ -776,9 +776,9 @@ MainInputManager::~MainInputManager() ...@@ -776,9 +776,9 @@ MainInputManager::~MainInputManager()
{ {
if( p_input ) if( p_input )
{ {
emit inputChanged( NULL );
var_DelCallback( p_input, "state", PLItemChanged, this ); var_DelCallback( p_input, "state", PLItemChanged, this );
vlc_object_release( p_input ); vlc_object_release( p_input );
emit inputChanged( NULL );
} }
var_DelCallback( p_intf->p_libvlc, "volume-change", VolumeChanged, this ); var_DelCallback( p_intf->p_libvlc, "volume-change", VolumeChanged, this );
...@@ -808,9 +808,9 @@ void MainInputManager::customEvent( QEvent *event ) ...@@ -808,9 +808,9 @@ void MainInputManager::customEvent( QEvent *event )
vlc_mutex_lock( &p_intf->change_lock ); vlc_mutex_lock( &p_intf->change_lock );
if( p_input && ( p_input->b_dead || !vlc_object_alive (p_input) ) ) if( p_input && ( p_input->b_dead || !vlc_object_alive (p_input) ) )
{ {
emit inputChanged( NULL );
var_DelCallback( p_input, "state", PLItemChanged, this ); var_DelCallback( p_input, "state", PLItemChanged, this );
vlc_object_release( p_input ); vlc_object_release( p_input );
emit inputChanged( NULL );
p_input = NULL; p_input = NULL;
vlc_mutex_unlock( &p_intf->change_lock ); vlc_mutex_unlock( &p_intf->change_lock );
return; return;
......
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