Commit baffdc12 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont
Browse files

httpd: Fix vlc_object_wait() usage. It's needed to check if we were not...

httpd: Fix vlc_object_wait() usage. It's needed to check if we were not already killed before calling vlc_object_wait(). Thanks to William King for spotting the deadlock.
parent 103061a6
......@@ -2455,7 +2455,11 @@ static void httpd_HostThread( httpd_host_t *host )
vlc_object_lock( host );
if( ufd[nfd - 1].revents )
b_die = vlc_object_wait( host );
{
b_die = !vlc_object_alive( host );
if( !b_die )
b_die = vlc_object_wait( host );
}
vlc_object_unlock( host );
/* Handle client sockets */
......
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