Changeset 26908 in vbox for trunk/src/VBox/Frontends

Timestamp:

Mar 1, 2010 12:49:28 PM (15 years ago)

Author:

vboxsync

Message:

Main/MachineImpl+Frontends/VirtualBox: disable showing VM start errors in the VM window if it was started by VirtualBox::openRemoteSession.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxConsoleWnd.cpp (modified) (4 diffs)
• globals/VBoxGlobal.cpp (modified) (3 diffs)
• globals/VBoxGlobal.h (modified) (2 diffs)
• main.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -1873 +1873 @@
     if (!console.isOk())
     {
-        vboxProblem().cannotStartMachine (console);
+        if (vboxGlobal().showStartVMErrors())
+            vboxProblem().cannotStartMachine (console);
         /* close this window (this will call closeView()) */
         close();
@@ -1886 +1887 @@
     /* Disable auto closure because we want to have a chance to show the
      * error dialog on startup failure */
-    mNoAutoClose = true;
+    if (vboxGlobal().showStartVMErrors())
+        mNoAutoClose = true;
 
     /* show the "VM starting / restoring" progress dialog */
@@ -1897 +1899 @@
     if (progress.GetResultCode() != 0)
     {
-        vboxProblem().cannotStartMachine (progress);
+        if (vboxGlobal().showStartVMErrors())
+            vboxProblem().cannotStartMachine (progress);
         /* close this window (this will call closeView()) */
         close();
@@ -1906 +1909 @@
     }
 
-    mNoAutoClose = false;
+    if (vboxGlobal().showStartVMErrors())
+        mNoAutoClose = false;
 
     /* Check if we missed a really quick termination after successful

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -4839 +4839 @@
 #endif
 
+    mShowStartVMErrors = true;
+    bool startVM = false;
+    QString vmNameOrUuid;
+
     int argc = qApp->argc();
     int i = 1;
@@ -4852 +4856 @@
             if (++i < argc)
             {
-                QString param = QString (qApp->argv() [i]);
-                QUuid uuid = QUuid(param);
-                if (!uuid.isNull())
-                {
-                    vmUuid = param;
-                }
-                else
-                {
-                    CMachine m = mVBox.FindMachine (param);
-                    if (m.isNull())
-                    {
-                        vboxProblem().cannotFindMachineByName (mVBox, param);
-                        return;
-                    }
-                    vmUuid = m.GetId();
-                }
+                vmNameOrUuid = QString (qApp->argv() [i]);
+                startVM = true;
             }
         }
@@ -4928 +4918 @@
             mStartPaused = false;
         }
+        else if (!::strcmp (arg, "--no-startvm-errormsgbox"))
+        {
+            mShowStartVMErrors = false;
+        }
 #endif
         /** @todo add an else { msgbox(syntax error); exit(1); } here, pretty please... */
         i++;
+    }
+
+    if (startVM)
+    {
+        QUuid uuid = QUuid(vmNameOrUuid);
+        if (!uuid.isNull())
+        {
+            vmUuid = vmNameOrUuid;
+        }
+        else
+        {
+            CMachine m = mVBox.FindMachine (vmNameOrUuid);
+            if (m.isNull())
+            {
+                if (showStartVMErrors())
+                    vboxProblem().cannotFindMachineByName (mVBox, vmNameOrUuid);
+                return;
+            }
+            vmUuid = m.GetId();
+        }
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h

@@ -321 +321 @@
 
     bool isVMConsoleProcess() const { return !vmUuid.isNull(); }
+    bool showStartVMErrors() const { return mShowStartVMErrors; }
 #ifdef VBOX_GUI_WITH_SYSTRAY
     bool isTrayMenu() const;
@@ -923 +924 @@
 #endif
 
+    /** Whether to show error message boxes for VM start errors. */
+    bool mShowStartVMErrors;
+
     QThread *mMediaEnumThread;
     VBoxMediaList mMediaList;

trunk/src/VBox/Frontends/VirtualBox/src/main.cpp

@@ -271 +271 @@
             "  --start-paused             start the VM in the paused state\n"
             "  --start-running            start the VM running (for overriding --debug*)\n"
+            "  --no-startvm-errormsgbox   do not show a message box for VM start errors\n"
             "\n"
             "The following environment variables are evaluated:\n"