Commit 58e693a2 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Win32: vlc_mutex_lock is *not* a cancellation point

parent d7aa9ec2
...@@ -191,6 +191,7 @@ void vlc_mutex_lock (vlc_mutex_t *p_mutex) ...@@ -191,6 +191,7 @@ void vlc_mutex_lock (vlc_mutex_t *p_mutex)
{ {
if (!p_mutex->dynamic) if (!p_mutex->dynamic)
{ /* static mutexes */ { /* static mutexes */
int canc = vlc_savecancel ();
assert (p_mutex != &super_mutex); /* this one cannot be static */ assert (p_mutex != &super_mutex); /* this one cannot be static */
vlc_mutex_lock (&super_mutex); vlc_mutex_lock (&super_mutex);
...@@ -202,6 +203,7 @@ void vlc_mutex_lock (vlc_mutex_t *p_mutex) ...@@ -202,6 +203,7 @@ void vlc_mutex_lock (vlc_mutex_t *p_mutex)
} }
p_mutex->locked = true; p_mutex->locked = true;
vlc_mutex_unlock (&super_mutex); vlc_mutex_unlock (&super_mutex);
vlc_restorecancel (canc);
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment