Fix previous commit (untested)

src/network/poll.c

@@ -46,6 +46,8 @@ int vlc_poll (struct pollfd *fds, unsigned nfds, int timeout)
     WSAEVENT phEvents[nfds];
     DWORD val;
 
+    vlc_testcancel ();
+
     for (unsigned i = 0; i < nfds; i++)
     {
         long events = FD_CLOSE;
@@ -62,25 +64,25 @@ int vlc_poll (struct pollfd *fds, unsigned nfds, int timeout)
         WSAEventSelect (fds[i].fd, phEvents[i], events);
     }
 
+    int ret = 0, n;
+
     switch (WaitForMultipleObjectsEx (nfds, phEvents, FALSE, timeout, TRUE))
     {
       case WAIT_IO_COMPLETION:
         WSASetLastError (WSAEINTR);
-        return -1;
+        ret = -1;
+        break;
       case WAIT_TIMEOUT:
-        return 0;
-    }
-
-    int n = 0, err = 0;
-
+        ret = 0;
+        break;
+      default:
         for (unsigned i = 0; i < nfds; i++)
         {
             WSANETWORKEVENTS events;
-        err = WSAEnumNetworkEvents (fds[i].fd, phEvents[i], &events);
-        WSACloseEvent (phEvents[i]);
-        if (err)
+            if (WSAEnumNetworkEvents (fds[i].fd, phEvents[i], &events))
             {
                 fds[i].revents |= POLLNVAL;
+                ret = -1;
                 continue;
             }
             if (events.lNetworkEvents & FD_CLOSE)
@@ -100,6 +102,14 @@ int vlc_poll (struct pollfd *fds, unsigned nfds, int timeout)
             if (fds[i].events)
                 n++;
         }
-    return err ? -1 : n;
+        if (ret == 0)
+            ret = n;
+    }
+
+    for (unsigned i = 0; i < nfds; i++)
+        WSACloseEvent (phEvents[i]);
+    vlc_testcancel ();
+
+    return ret;
 }
 #endif /* WIN32 */