]> git.sesse.net Git - vlc/commitdiff
Disable cancellation everywhere (except in msg_Dbg) to start with
authorRémi Denis-Courmont <rdenis@simphalempin.com>
Sun, 6 Jul 2008 18:35:27 +0000 (21:35 +0300)
committerRémi Denis-Courmont <rdenis@simphalempin.com>
Wed, 27 Aug 2008 19:43:07 +0000 (22:43 +0300)
src/misc/threads.c

index 69b9fd44697df0695c63ae2bc15847d9fca636a5..320066ed69af65a92fe8c01bfb8c0c0b4674293f 100644 (file)
@@ -640,13 +640,16 @@ static void *thread_entry (void *data)
 {
     vlc_object_t *obj = ((struct vlc_thread_boot *)data)->object;
     void *(*func) (vlc_object_t *) = ((struct vlc_thread_boot *)data)->entry;
+    int canc;
 
     free (data);
 #ifndef NDEBUG
     vlc_threadvar_set (&thread_object_key, obj);
 #endif
     msg_Dbg (obj, "thread started");
+    canc = vlc_savecancel ();
     func (obj);
+    vlc_restorecancel (canc);
     msg_Dbg (obj, "thread ended");
 
     return NULL;