From: Rafaël Carré Date: Thu, 20 Aug 2009 06:17:33 +0000 (+0200) Subject: update_Delete: Fix update download thread destruction X-Git-Tag: 1.1.0-ff~4183 X-Git-Url: http://git.videolan.org/gitweb.cgi/vlc.git/?p=vlc.git;p=vlc.git;a=commitdiff_plain;h=dfd672cc3bc3720ebc32330013b5a2801f6a1b17;hp=85abebf7168aba4fbbfe806567d8a2d55f6ca784 update_Delete: Fix update download thread destruction --- diff --git a/src/misc/update.c b/src/misc/update.c index 7cbaea099e..914eaa5848 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; }