[vlc-devel] commit: p_vlm destruction fixes ( Sébastien Escudier )

[git version control]

vlc | branch: 1.0-bugfix | Sébastien Escudier <sebastien-devel at celeos.eu> | Wed May 27 11:43:16 2009 +0200| [bda8b20504562d8212462f8c1941fc3ea805ce34] | committer: Rémi Denis-Courmont 

p_vlm destruction fixes

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

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

 src/control/core.c |    2 ++
 src/control/vlm.c  |    1 +
 2 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/control/core.c b/src/control/core.c
index 0ac8a3c..b09799d 100644
--- a/src/control/core.c
+++ b/src/control/core.c
@@ -173,6 +173,8 @@ void libvlc_release( libvlc_instance_t *p_instance )
     {
         vlc_mutex_destroy( lock );
         vlc_mutex_destroy( &p_instance->event_callback_lock );
+        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 5c1b15f..e07fd88 100644
--- a/src/control/vlm.c
+++ b/src/control/vlm.c
@@ -167,6 +167,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,