Changeset 21139 in vbox

Timestamp:

Jul 1, 2009 6:23:59 PM (15 years ago)

Author:

vboxsync

Message:

VBoxService: Fixed handling of disabled services.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxService.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxService.cpp

@@ -278 +278 @@
     VBoxServiceVerbose(2, "Initializing services ...\n");
     for (unsigned j = 0; j < RT_ELEMENTS(g_aServices); j++)
-    {
-        rc = g_aServices[j].pDesc->pfnInit();
-        if (RT_FAILURE(rc))
+        if (g_aServices[j].fEnabled)
         {
-            VBoxServiceError("Service '%s' failed pre-init: %Rrc\n", g_aServices[j].pDesc->pszName);
-            return rc;
+
+            rc = g_aServices[j].pDesc->pfnInit();
+            if (RT_FAILURE(rc))
+            {
+                VBoxServiceError("Service '%s' failed pre-init: %Rrc\n", g_aServices[j].pDesc->pszName);
+                return rc;
+            }
         }
-    }
 
     /*
@@ -342 +344 @@
             g_aServices[j].pDesc->pfnStop();
     for (unsigned j = 0; j < RT_ELEMENTS(g_aServices); j++)
-    {
-        if (g_aServices[j].Thread != NIL_RTTHREAD)
+        if (g_aServices[j].fEnabled)
         {
-            int rc = RTThreadWait(g_aServices[j].Thread, 30*1000, NULL);
-            if (RT_FAILURE(rc))
-                VBoxServiceError("Service '%s' failed to stop. (%Rrc)\n", g_aServices[j].pDesc->pszName, rc);
+            if (g_aServices[j].Thread != NIL_RTTHREAD)
+            {
+                int rc = RTThreadWait(g_aServices[j].Thread, 30*1000, NULL);
+                if (RT_FAILURE(rc))
+                    VBoxServiceError("Service '%s' failed to stop. (%Rrc)\n", g_aServices[j].pDesc->pszName, rc);
+            }
+            g_aServices[j].pDesc->pfnTerm();
         }
-        g_aServices[j].pDesc->pfnTerm();
-    }
 
     VBoxServiceVerbose(2, "Stopping services returned: rc=%Rrc\n", rc);