]> git.sesse.net Git - vlc/commitdiff
SAP out: do not access b_die directly
authorRémi Denis-Courmont <rdenis@simphalempin.com>
Sat, 16 Aug 2008 16:30:46 +0000 (19:30 +0300)
committerRémi Denis-Courmont <rdenis@simphalempin.com>
Wed, 27 Aug 2008 19:43:14 +0000 (22:43 +0300)
src/stream_output/sap.c

index 36e27cd35b5019d780dde8f4b04050e7f83e5c75..cc6f88793c260eeeed837ce74c0d181dd5953643 100644 (file)
@@ -192,10 +192,9 @@ static void * RunThread( vlc_object_t *p_this)
 {
     sap_handler_t *p_sap = (sap_handler_t*)p_this;
     sap_session_t *p_session;
-    int canc = vlc_savecancel ();
     /* TODO: Use poll() instead of msleep()). */
 
-    while( !p_sap->b_die )
+    for (;;)
     {
         int i;
 
@@ -234,11 +233,12 @@ static void * RunThread( vlc_object_t *p_this)
         if( p_session->p_address->b_enabled == true &&
             p_session->p_address->b_ready == true )
         {
+            int canc = vlc_savecancel ();
             announce_SendSAPAnnounce( p_sap, p_session );
+            vlc_restorecancel (canc);
         }
         vlc_object_unlock( p_sap );
     }
-    vlc_restorecancel (canc);
     return NULL;
 }