]> git.sesse.net Git - vlc/commitdiff
stream_filter/httplive.c: Do not allow cancellation of hls_Thread().
authorJean-Paul Saman <jean-paul.saman@m2x.nl>
Tue, 22 Feb 2011 14:27:07 +0000 (15:27 +0100)
committerJean-Paul Saman <jean-paul.saman@m2x.nl>
Tue, 22 Feb 2011 14:28:03 +0000 (15:28 +0100)
Do not allow cancellation of hls_Thread().

modules/stream_filter/httplive.c

index c2f67ede4bcd07c8cc5fd744adb86f0e4f2af22c..a1651014e241e59d452d36797d8fd787d8de0d01 100644 (file)
@@ -1121,6 +1121,8 @@ static void* hls_Thread(void *p_this)
     stream_t *s = (stream_t *)p_this;
     stream_sys_t *p_sys = s->p_sys;
 
+    int canc = vlc_savecancel();
+
     while (vlc_object_alive(s))
     {
         hls_stream_t *hls = hls_Get(p_sys->hls_stream, p_sys->download.stream);
@@ -1213,6 +1215,7 @@ static void* hls_Thread(void *p_this)
         vlc_mutex_unlock(&p_sys->download.lock_wait);
     }
 
+    vlc_restorecancel(canc);
     return NULL;
 }