Revert "services: Fix problem with usbhub waiting."

This reverts commit e2f4a264a63c0cd6fff7f3cb8c3ba4c023e5aa60.

diff --git a/programs/services/services.c b/programs/services/services.c
index 45520d059d9418a89bc28d8457b483af555ecc3a..53d21529a1f1b8723630677c459a3e38caee43d1 100644 (file)
--- a/programs/services/services.c
+++ b/programs/services/services.c
@@ -268,23 +268,17 @@ static void scmdatabase_autostart_services(struct scmdatabase *db)
     size = i;
     for (i = 0; i < size; i++)
     {
-#ifdef HAVE_LIBUSB
-        HANDLE event = NULL;
-#endif
         DWORD err;
         const WCHAR *argv[2];
         service = services_list[i];
         argv[0] = service->name;
         argv[1] = NULL;
-#ifdef HAVE_LIBUSB
-        if (!strcmpW(service->name, usbhub))
-            event = CreateEventW(NULL, TRUE, FALSE, usbhub_started_event);
-#endif
         err = service_start(service, 1, argv);
         /* FIXME: do something if the service failed to start */
 #ifdef HAVE_LIBUSB
-        if (event)
+        if (!strcmpW(service->name, usbhub))
         {
+            HANDLE event = CreateEventW(NULL, TRUE, FALSE, usbhub_started_event);
             WaitForSingleObject(event, 30000);
             CloseHandle(event);
         }