Commit 352cbd7c authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Unload interface plugin in StopThread rather than destroy

That is the same problem as we already had with other object types.
The interface really needs to unload when its owner stops it, not when
the reference counter drops to zero. This fixes a reference dead loop
when an interface yields itself (such as Qt through the view menu) and
a crash if an interface releases itself last (unmapping the running
caller code).
parent a276d9aa
...@@ -67,10 +67,6 @@ static void intf_Destroy( vlc_object_t *obj ) ...@@ -67,10 +67,6 @@ static void intf_Destroy( vlc_object_t *obj )
{ {
intf_thread_t *p_intf = (intf_thread_t *)obj; intf_thread_t *p_intf = (intf_thread_t *)obj;
/* Unlock module if present (a switch may have failed) */
if( p_intf->p_module )
module_unneed( p_intf, p_intf->p_module );
free( p_intf->psz_intf ); free( p_intf->psz_intf );
config_ChainDestroy( p_intf->p_cfg ); config_ChainDestroy( p_intf->p_cfg );
vlc_mutex_destroy( &p_intf->change_lock ); vlc_mutex_destroy( &p_intf->change_lock );
...@@ -182,6 +178,8 @@ void intf_StopThread( intf_thread_t *p_intf ) ...@@ -182,6 +178,8 @@ void intf_StopThread( intf_thread_t *p_intf )
/* Tell the interface to die */ /* Tell the interface to die */
vlc_object_kill( p_intf ); vlc_object_kill( p_intf );
vlc_thread_join( p_intf ); vlc_thread_join( p_intf );
module_unneed( p_intf, p_intf->p_module );
} }
......
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