]> git.sesse.net Git - vlc/commitdiff
update_Delete: Fix update download thread destruction
authorRafaël Carré <rafael.carre@gmail.com>
Thu, 20 Aug 2009 06:17:33 +0000 (08:17 +0200)
committerRafaël Carré <rafael.carre@gmail.com>
Thu, 20 Aug 2009 06:17:33 +0000 (08:17 +0200)
src/misc/update.c

index 7cbaea099e6859398fcbb8137bdb7dd28de6dd49..914eaa58488db05f0fd17d029ea06a32beee435e 100644 (file)
@@ -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;
 }