[vlc-devel] commit: VLM: join before destroy ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Sun Aug 17 13:22:43 2008 +0300| [0bb7a50e7484c73cdc7a61b01a4980e77b20c799] | committer: Rémi Denis-Courmont 

VLM: join before destroy

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

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

diff --git a/src/input/vlm.c b/src/input/vlm.c
index 95dca27..611785e 100644
--- a/src/input/vlm.c
+++ b/src/input/vlm.c
@@ -155,6 +155,8 @@ void vlm_Delete( vlm_t *p_vlm )
      * is serialized against setting libvlc_priv->p_vlm from vlm_New(). */
     var_Get( p_vlm->p_libvlc, "vlm_mutex", &lockval );
     vlc_mutex_lock( lockval.p_address );
+    vlc_object_kill( p_vlm );
+    vlc_thread_join( p_vlm );
     vlc_object_release( p_vlm );
     vlc_mutex_unlock( lockval.p_address );
 }