[vlc-commits] Revert "VLM: remove dummy vlc_object_kill()"

Pierre Ynard git at videolan.org
Fri May 18 02:31:51 CEST 2012


vlc | branch: master | Pierre Ynard <linkfanel at yahoo.fr> | Fri May 18 02:30:54 2012 +0200| [efde90d8c090f88380ef8dd1987e9941db3bdf91] | committer: Pierre Ynard

Revert "VLM: remove dummy vlc_object_kill()"

This reverts commit 72cae4ddf388e956ce4c829aaf1c14974905a3b0.
vlc_object_kill() is in fact needed because the main loop does check
b_die.

Signed-off-by: Pierre Ynard <linkfanel at yahoo.fr>

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

 src/input/vlm.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/input/vlm.c b/src/input/vlm.c
index ee31e6b..4dce5ec 100644
--- a/src/input/vlm.c
+++ b/src/input/vlm.c
@@ -233,6 +233,8 @@ void vlm_Delete( vlm_t *p_vlm )
     TAB_CLEAN( p_vlm->i_schedule, p_vlm->schedule );
     vlc_mutex_unlock( &p_vlm->lock );
 
+    vlc_object_kill( p_vlm );
+
     if( p_vlm->p_vod )
     {
         module_unneed( p_vlm->p_vod, p_vlm->p_vod->p_module );



More information about the vlc-commits mailing list