Changeset 58556 in vbox for trunk

Timestamp:

Nov 4, 2015 9:05:29 AM (9 years ago)

Author:

vboxsync

Message:

Installer/win/Stub/VBoxStub.cpp: Don't start the installation when showing the version information or help dialogs.

File:

• trunk/src/VBox/Installer/win/Stub/VBoxStub.cpp (modified) (5 diffs)

trunk/src/VBox/Installer/win/Stub/VBoxStub.cpp

@@ -881 +881 @@
     /* Parse the parameters. */
     int ch;
-    bool fParsingDone = false;
+    bool fExitEarly = false;
     RTGETOPTUNION ValueUnion;
     RTGETOPTSTATE GetState;
@@ -887 +887 @@
     while (   (ch = RTGetOpt(&GetState, &ValueUnion))
            && rcExit == RTEXITCODE_SUCCESS
-           && !fParsingDone)
+           && !fExitEarly)
     {
         switch (ch)
@@ -937 +937 @@
                          VBOX_VERSION_MAJOR, VBOX_VERSION_MINOR, VBOX_VERSION_BUILD,
                          VBOX_SVN_REV);
-                fParsingDone = true;
+                fExitEarly = true;
                 break;
 
@@ -962 +962 @@
                          VBOX_STUB_TITLE, VBOX_VERSION_MAJOR, VBOX_VERSION_MINOR, VBOX_VERSION_BUILD, VBOX_SVN_REV,
                          argv[0], argv[0]);
-                fParsingDone = true;
+                fExitEarly = true;
                 break;
 
@@ -993 +993 @@
         }
     }
+
+    /* Check if we can bail out early. */
+    if (fExitEarly)
+        return rcExit;
 
     if (rcExit != RTEXITCODE_SUCCESS)