Changeset f9b646408f693e006d9df0afd3355374f0583d12

Timestamp:

05/31/08 18:37:20 (3 months ago)

Author:

Rémi Denis-Courmont <rdenis@simphalempin.com>

git-committer:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1212251840 +0300

git-parent:

[1245b2b35ab23b0a9e06a7194b937e592570bbdf]

git-author:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1212251840 +0300

Message:

Kill LibVLC children without the libvlc lock

Files:

• src/misc/objects.c (modified) (1 diff)

src/misc/objects.c

@@ -622 +622 @@
-    }
-
-    if( p_this->i_object_type == VLC_OBJECT_LIBVLC )
-        for( int i = 0; i < internals->i_children ; i++ )
-            vlc_object_kill( internals->pp_children[i] );
-
-    vlc_object_signal_unlocked( p_this );
-    vlc_mutex_unlock( &p_this->object_lock );
+
+    if (p_this->i_object_type == VLC_OBJECT_LIBVLC)
+    {
+        vlc_list_t *children = vlc_list_children (p_this);
+        for (int i = 0; i < children->i_count; i++)
+            vlc_object_kill (children->p_values[i].p_object);
+        vlc_list_release (children);
+    }
-}
-