Ensure fast fetcher/preparser thread cancelation.

diff --git a/src/playlist/fetcher.c b/src/playlist/fetcher.c
index 690385f53039e52f801bd7a5f8018994aa9c3061..88a289c695b41c2a8ddb2ee7b8ed5ed085e76b3b 100644 (file)
--- a/src/playlist/fetcher.c
+++ b/src/playlist/fetcher.c
@@ -366,6 +366,9 @@ static void *Thread( void *p_data )
     {
         input_item_t *p_item;
 
+        /* Be sure to be cancellable before our queue is empty */
+        vlc_testcancel();
+
         /* */
         vlc_mutex_lock( &p_fetcher->lock );
         mutex_cleanup_push( &p_fetcher->lock );

diff --git a/src/playlist/preparser.c b/src/playlist/preparser.c
index cca30229f214dac133618e00f327cad13cce703d..c8c52cadf149599655286a805365256949cc4340 100644 (file)
--- a/src/playlist/preparser.c
+++ b/src/playlist/preparser.c
@@ -187,6 +187,9 @@ static void *Thread( void *data )
     {
         input_item_t *p_current;
 
+        /* Be sure to be cancellable before our queue is empty */
+        vlc_testcancel();
+
         /* */
         vlc_mutex_lock( &p_preparser->lock );
         mutex_cleanup_push( &p_preparser->lock );