[vlc-devel] commit: Revert "Detach the children at object destruction" ( Rafaël Carré )

git version control git at videolan.org
Fri May 16 14:13:42 CEST 2008


vlc | branch: master | Rafaël Carré <funman at videolan.org> | Fri May 16 14:14:59 2008 +0200| [5d93a7aeb0a773ea3e4c7962f71743537deeb61a]

Revert "Detach the children at object destruction"

This reverts commit e5b3d194ffa17dcbf57e69ebf83c3730e8938932.

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

 src/misc/objects.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/misc/objects.c b/src/misc/objects.c
index f688643..010d64d 100644
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -872,7 +872,7 @@ void __vlc_object_release( vlc_object_t *p_this )
         vlc_object_detach_unlocked (p_this);
     /* Detach from children to protect against FIND_PARENT */
     for (int i = 0; i < p_this->i_children; i++)
-        vlc_object_detach_unlocked( p_this->pp_children[i] );
+        p_this->pp_children[i]->p_parent = NULL;
 
     vlc_mutex_unlock( &structure_lock );
 




More information about the vlc-devel mailing list