[vlc-devel] commit: update_Delete: Fix update download thread destruction ( Rafaël Carré )

[git version control]

vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Thu Aug 20 08:17:33 2009 +0200| [dfd672cc3bc3720ebc32330013b5a2801f6a1b17] | committer: Rafaël Carré 

update_Delete: Fix update download thread destruction

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

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

diff --git a/src/misc/update.c b/src/misc/update.c
index 7cbaea0..914eaa5 100644
--- a/src/misc/update.c
+++ b/src/misc/update.c
@@ -143,12 +143,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 );
@@ -732,8 +732,6 @@ end:
     free( p_buffer );
     free( psz_size );
 
-    p_udt->p_update->p_download = NULL;
-
     vlc_restorecancel( canc );
     return NULL;
 }