From: Rémi Denis-Courmont <remi@remlab.net>
Date: Thu, 28 Jan 2010 16:54:44 +0000 (+0200)
Subject: Attach playlist ASAP
X-Git-Tag: 1.1.0-ff~768
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=f6f1fa0be95ac9bbce70760fa8f87f3396944407;p=vlc

Attach playlist ASAP

vlc_object_find is not used for the playlist anymore, so this is OK.
---

diff --git a/src/libvlc.c b/src/libvlc.c
index 34926aeeab..10203841bb 100644
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -813,7 +813,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
         return VLC_EGENERIC;
     }
     playlist_Activate( p_playlist );
-    vlc_object_attach( p_playlist, p_libvlc );
 
     /* Add service discovery modules */
     psz_modules = var_CreateGetNonEmptyString( p_playlist, "services-discovery" );
diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index 6dab8e72e0..7ac8407a05 100644
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -76,6 +76,7 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
 
     assert( offsetof( playlist_private_t, public_data ) == 0 );
     p_playlist = &p->public_data;
+    vlc_object_attach( p_playlist, p_parent );
     TAB_INIT( pl_priv(p_playlist)->i_sds, pl_priv(p_playlist)->pp_sds );
 
     libvlc_priv(p_parent->p_libvlc)->p_playlist = p_playlist;