]> git.sesse.net Git - vlc/commitdiff
VLM: join before destroy
authorRémi Denis-Courmont <rdenis@simphalempin.com>
Sun, 17 Aug 2008 10:22:43 +0000 (13:22 +0300)
committerRémi Denis-Courmont <rdenis@simphalempin.com>
Sun, 17 Aug 2008 10:22:43 +0000 (13:22 +0300)
src/input/vlm.c

index 95dca27ebbb8ee413d30b1be311845190aa672df..611785ee28a10047c317895417b6dfc0ddb7f885 100644 (file)
@@ -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 );
 }