Plugins: push cancellation down

[vlc] / modules / misc / freetype.c

diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c
index d7c93f58a12b845e948f77a97958e92bc474df6d..774ae1633729ad13a2ddf1c3ab7a474f5a790a47 100644 (file)
--- a/modules/misc/freetype.c
+++ b/modules/misc/freetype.c
@@ -525,6 +525,7 @@ static void* FontBuilderThread( vlc_object_t *p_this )
     if( p_fontconfig )
     {
         mtime_t    t1, t2;
+        int canc = vlc_savecancel ();
 
         //msg_Dbg( p_this, "Building font database..." );
         msg_Dbg( p_this, "Building font database..." );
@@ -548,6 +549,7 @@ static void* FontBuilderThread( vlc_object_t *p_this )
         vlc_mutex_unlock( p_lock );
 
         var_SetBool( p_this, "build-done", true );
+        vlc_restorecancel (canc);
     }
     return NULL;
 }