[vlc-devel] commit: update_Delete: Fix update download thread destruction ( Jean-Baptiste Kempf )

[git version control]

vlc | branch: 1.0-bugfix | Jean-Baptiste Kempf <jb at videolan.org> | Sun Sep 20 12:04:57 2009 +0200| [66f857258807ec021970b5024f6abb0fccb78c57] | committer: Jean-Baptiste Kempf 

update_Delete: Fix update download thread destruction
(cherry picked from commit dfd672cc3bc3720ebc32330013b5a2801f6a1b17)

Conflicts:

	src/misc/update.c

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

 src/misc/update.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/misc/update.c b/src/misc/update.c
index a0f4334..bf34fa8 100644
--- a/src/misc/update.c
+++ b/src/misc/update.c
@@ -1081,12 +1081,12 @@ void update_Delete( update_t *p_update )
 
     if( p_update->p_check )
     {
-        assert( !p_update->p_download );
         vlc_object_kill( p_update->p_check );
         vlc_thread_join( p_update->p_check );
         vlc_object_release( p_update->p_check );
     }
-    else if( p_update->p_download )
+
+    if( p_update->p_download )
     {
         vlc_object_kill( p_update->p_download );
         vlc_thread_join( p_update->p_download );
@@ -1735,9 +1735,6 @@ end:
     free( p_buffer );
     free( psz_size );
 
-    p_udt->p_update->p_download = NULL;
-
-    vlc_object_release( p_udt );
     vlc_restorecancel( canc );
     return NULL;
 }