Changeset 70ad10b0c4caa43776ec0f79271f1bae34310cde

Show
Ignore:
Timestamp:
05/16/08 18:13:37 (2 months ago)
Author:
Rémi Denis-Courmont <rem@videolan.org>
git-committer:
Rémi Denis-Courmont <rem@videolan.org> 1210954417 +0300
git-parent:

[00e3e4101653be55e430b35d6fcb8d5b86df269d]

git-author:
Rémi Denis-Courmont <rem@videolan.org> 1210954417 +0300
Message:

Simplification

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • src/misc/objects.c

    r00e3e41 r70ad10b  
    878878 
    879879        /* Detach from parent to protect against FIND_CHILDREN */ 
    880         if (p_this->p_parent) 
    881             vlc_object_detach_unlocked (p_this); 
     880        vlc_object_detach_unlocked (p_this); 
    882881        /* Detach from children to protect against FIND_PARENT */ 
    883882        for (int i = 0; i < internals->i_children; i++) 
    …… 
    967966 
    968967    vlc_mutex_lock( &structure_lock ); 
    969  
    970968    if( !p_this->p_parent ) 
    971     { 
    972969        msg_Err( p_this, "object is not attached" ); 
    973         vlc_mutex_unlock( &structure_lock ); 
    974         return; 
    975     } 
    976  
    977     vlc_object_detach_unlocked( p_this ); 
     970    else 
     971        vlc_object_detach_unlocked( p_this ); 
    978972    vlc_mutex_unlock( &structure_lock ); 
    979973}