libvlc: do not disable the playlist earlier automatically

src/libvlc.c

@@ -599,10 +599,6 @@ void libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
     libvlc_priv_t *priv = libvlc_priv (p_libvlc);
     playlist_t    *p_playlist = libvlc_priv (p_libvlc)->p_playlist;
 
-    /* Deactivate the playlist */
-    msg_Dbg( p_libvlc, "deactivating the playlist" );
-    pl_Deactivate( p_libvlc );
-
     /* Remove all services discovery */
     msg_Dbg( p_libvlc, "removing all services discovery tasks" );
     playlist_ServicesDiscoveryKillAll( p_playlist );

src/playlist/control.c

@@ -60,18 +60,6 @@ playlist_t *pl_Get (vlc_object_t *obj)
     return pl;
 }
 
-void pl_Deactivate (libvlc_int_t *p_libvlc)
-{
-    bool deactivate;
-
-    vlc_mutex_lock (&global_lock);
-    deactivate = libvlc_priv (p_libvlc)->playlist_active;
-    vlc_mutex_unlock (&global_lock);
-
-    if (deactivate)
-        playlist_Deactivate (libvlc_priv (p_libvlc)->p_playlist);
-}
-
 void playlist_Lock( playlist_t *pl )
 {
     vlc_mutex_lock( &pl_priv(pl)->lock );

src/playlist/engine.c

@@ -314,6 +314,7 @@ void playlist_Destroy( playlist_t *p_playlist )
 
     msg_Dbg( p_playlist, "destroying" );
 
+    playlist_Deactivate( p_playlist );
     if( p_sys->p_preparser )
         playlist_preparser_Delete( p_sys->p_preparser );
     if( p_sys->p_fetcher )

src/playlist/playlist_internal.h

@@ -104,7 +104,6 @@ void playlist_Destroy( playlist_t * );
 
 /* */
 void playlist_Activate( playlist_t * );
-void pl_Deactivate (libvlc_int_t *);
 
 /* */
 playlist_item_t *playlist_ItemNewFromInput( playlist_t *p_playlist,