]> git.sesse.net Git - vlc/commitdiff
Run SD threads (if any) with cancellation
authorRémi Denis-Courmont <rdenis@simphalempin.com>
Thu, 28 Aug 2008 19:41:28 +0000 (22:41 +0300)
committerRémi Denis-Courmont <rdenis@simphalempin.com>
Thu, 28 Aug 2008 19:42:06 +0000 (22:42 +0300)
src/playlist/services_discovery.c

index 35feabc6b954c16df35952a3a9196d3e59a53a6d..229f984e2a281d0873b87f061a927225e1c819bc 100644 (file)
@@ -209,11 +209,12 @@ static void* RunSD( vlc_object_t *p_this )
         .type = vlc_ServicesDiscoveryStarted
     };
     int canc = vlc_savecancel ();
-
     vlc_event_send( &p_sd->event_manager, &event );
+    vlc_restorecancel (canc);
 
     p_sd->pf_run( p_sd );
 
+    canc = vlc_savecancel ();
     event.type = vlc_ServicesDiscoveryEnded;
     vlc_event_send( &p_sd->event_manager, &event );
     vlc_restorecancel (canc);