]> git.sesse.net Git - vlc/commitdiff
httpd: Fix vlc_object_wait() usage. It's needed to check if we were not already kille...
authorPierre d'Herbemont <pdherbemont@videolan.org>
Tue, 22 Apr 2008 15:11:46 +0000 (17:11 +0200)
committerPierre d'Herbemont <pdherbemont@videolan.org>
Tue, 22 Apr 2008 15:12:05 +0000 (17:12 +0200)
src/network/httpd.c

index 97947da0afa90e015d9154907cf04b105b165827..dad2c141d2f4d2cbc3b5d7feb1a4aa2ecff2fa29 100644 (file)
@@ -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 */