p_vlm destruction fixes

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

diff --git a/src/control/core.c b/src/control/core.c
index da2a9b2d969bec7c61fda01391d318814b5a8dc6..7a062211f36e6ce824609a03fc414edb77b95aba 100644 (file)
--- a/src/control/core.c
+++ b/src/control/core.c
@@ -176,6 +176,8 @@ void libvlc_release( libvlc_instance_t *p_instance )
         vlc_mutex_destroy( &p_instance->event_callback_lock );
         if( p_instance->p_event_manager )
             libvlc_event_manager_release( p_instance->p_event_manager );
+        if( p_instance->p_vlm )
+            vlm_Delete( p_instance->p_vlm );
         libvlc_InternalCleanup( p_instance->p_libvlc_int );
         libvlc_InternalDestroy( p_instance->p_libvlc_int );
         free( p_instance );

diff --git a/src/control/vlm.c b/src/control/vlm.c
index 2942d8018fb537fb26539d4e3b0e4de6f520a609..824d57d7f12115bd162c8ede4031ed90ecb329b6 100644 (file)
--- a/src/control/vlm.c
+++ b/src/control/vlm.c
@@ -218,6 +218,7 @@ void libvlc_vlm_release( libvlc_instance_t *p_instance,
     VLM(p_vlm);
 
     vlm_Delete( p_vlm );
+    p_instance->p_vlm = NULL;
 }
 
 void libvlc_vlm_add_broadcast( libvlc_instance_t *p_instance,