Commit 70ad10b0 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Simplification

parent 00e3e410
...@@ -877,8 +877,7 @@ void __vlc_object_release( vlc_object_t *p_this ) ...@@ -877,8 +877,7 @@ void __vlc_object_release( vlc_object_t *p_this )
p_libvlc_global->i_objects, i_index ); p_libvlc_global->i_objects, i_index );
/* Detach from parent to protect against FIND_CHILDREN */ /* Detach from parent to protect against FIND_CHILDREN */
if (p_this->p_parent) vlc_object_detach_unlocked (p_this);
vlc_object_detach_unlocked (p_this);
/* Detach from children to protect against FIND_PARENT */ /* Detach from children to protect against FIND_PARENT */
for (int i = 0; i < internals->i_children; i++) for (int i = 0; i < internals->i_children; i++)
internals->pp_children[i]->p_parent = NULL; internals->pp_children[i]->p_parent = NULL;
...@@ -966,15 +965,10 @@ void __vlc_object_detach( vlc_object_t *p_this ) ...@@ -966,15 +965,10 @@ void __vlc_object_detach( vlc_object_t *p_this )
if( !p_this ) return; if( !p_this ) return;
vlc_mutex_lock( &structure_lock ); vlc_mutex_lock( &structure_lock );
if( !p_this->p_parent ) if( !p_this->p_parent )
{
msg_Err( p_this, "object is not attached" ); msg_Err( p_this, "object is not attached" );
vlc_mutex_unlock( &structure_lock ); else
return; vlc_object_detach_unlocked( p_this );
}
vlc_object_detach_unlocked( p_this );
vlc_mutex_unlock( &structure_lock ); vlc_mutex_unlock( &structure_lock );
} }
......
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