Changeset 83271 in vbox for trunk/src/VBox/Frontends/VBoxAutostart

Timestamp:

Mar 12, 2020 2:03:49 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

136424

Message:

Main: bugref:9341: Fixed "the VM starts always during autostart regardless the config for the current user in Windows"

File:

• trunk/src/VBox/Frontends/VBoxAutostart/VBoxAutostart-win.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VBoxAutostart/VBoxAutostart-win.cpp

@@ -779 +779 @@
 }
 
-static int autostartStartVMs()
+static RTEXITCODE autostartStartVMs()
 {
     int rc = autostartSetup();
+    if (RT_FAILURE(rc))
+        return RTEXITCODE_FAILURE;
 
     const char *pszConfigFile = RTEnvGet("VBOXAUTOSTART_CONFIG");
@@ -865 +867 @@
     }
 
-    rc = autostartStartMain(pCfgAstUser);
+    RTEXITCODE ec = autostartStartMain(pCfgAstUser);
     autostartConfigAstDestroy(pCfgAst);
-    if (RT_FAILURE(rc))
-        autostartSvcLogError("Starting VMs failed, rc=%Rrc\n", rc);
-
-    return rc;
+    if (ec != RTEXITCODE_SUCCESS)
+        autostartSvcLogError("Starting VMs failed\n");
+
+    return ec;
 }
 
@@ -912 +914 @@
                     {
                         LogFlow(("autostartSvcWinServiceMain: calling autostartStartVMs\n"));
-                        rc = autostartStartVMs();
-                        if (RT_SUCCESS(rc))
+                        RTEXITCODE ec = autostartStartVMs();
+                        if (ec == RTEXITCODE_SUCCESS)
                         {
                             LogFlow(("autostartSvcWinServiceMain: done string VMs\n"));