[vlc-commits] mediadirs: remove cargo-cultivated vlc_cancel()

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Nov 14 22:51:25 2016 +0200| [a1e55cc4d1ce44ad6362ef38efaa6d4bb5c57bec] | committer: Rémi Denis-Courmont

mediadirs: remove cargo-cultivated vlc_cancel()

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

 modules/services_discovery/mediadirs.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/modules/services_discovery/mediadirs.c b/modules/services_discovery/mediadirs.c
index 11811c9..9b2bf2c 100644
--- a/modules/services_discovery/mediadirs.c
+++ b/modules/services_discovery/mediadirs.c
@@ -176,8 +176,6 @@ static void *Run( void *data )
     services_discovery_t *p_sd = data;
     services_discovery_sys_t *p_sys = p_sd->p_sys;
 
-    int canc = vlc_savecancel();
-
     int num_dir = sizeof( p_sys->psz_dir ) / sizeof( p_sys->psz_dir[0] );
     for( int i = 0; i < num_dir; i++ )
     {
@@ -214,7 +212,6 @@ static void *Run( void *data )
         free( psz_uri );
     }
 
-    vlc_restorecancel(canc);
     return NULL;
 }
 
@@ -226,7 +223,6 @@ static void Close( vlc_object_t *p_this )
     services_discovery_t *p_sd = (services_discovery_t *)p_this;
     services_discovery_sys_t *p_sys = p_sd->p_sys;
 
-    vlc_cancel( p_sys->thread );
     vlc_join( p_sys->thread, NULL );
 
     var_DelCallback( p_sd->obj.libvlc, p_sys->psz_var, onNewFileAdded, p_sd );