Changeset 52995 in vbox for trunk

Timestamp:

Oct 8, 2014 1:55:16 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI rework/cleanup for 7115 (part #6): Better encapsulation for UIMachine (part #3).

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (1 diff)
• runtime/UIMachine.cpp (modified) (3 diffs)
• runtime/UIMachine.h (modified) (1 diff)

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

@@ -4109 +4109 @@
         m_fSeparateProcess = fSeparateProcess;
 
+        /* Search for corresponding VM: */
         QUuid uuid = QUuid(vmNameOrUuid);
+        const CMachine machine = mVBox.FindMachine(vmNameOrUuid);
         if (!uuid.isNull())
         {
-            vmUuid = vmNameOrUuid;
+            if (machine.isNull() && showStartVMErrors())
+                return msgCenter().cannotFindMachineById(mVBox, vmNameOrUuid);
         }
         else
         {
-            CMachine m = mVBox.FindMachine (vmNameOrUuid);
-            if (m.isNull())
-            {
-                if (showStartVMErrors())
-                    msgCenter().cannotFindMachineByName (mVBox, vmNameOrUuid);
-                return;
-            }
-            vmUuid = m.GetId();
-        }
+            if (machine.isNull() && showStartVMErrors())
+                return msgCenter().cannotFindMachineByName(mVBox, vmNameOrUuid);
+        }
+        vmUuid = machine.GetId();
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp

@@ -115 +115 @@
 
         /* Which VM we operate on? */
-        CMachine machine  = session.GetMachine();
+        CMachine machine = session.GetMachine();
         /* Which snapshot we are restoring? */
         CSnapshot snapshot = machine.GetCurrentSnapshot();
@@ -138 +138 @@
     }
 
+    /* For separate process we should launch VM before UI: */
+    if (vboxGlobal().isSeparateProcess())
+    {
+        /* Get corresponding machine: */
+        CMachine machine = vboxGlobal().virtualBox().FindMachine(vboxGlobal().managedVMUuid());
+        AssertMsgReturn(!machine.isNull(), ("VBoxGlobal::managedVMUuid() should have filter that case before!\n"), false);
+
+        /* Try to launch corresponding machine: */
+        if (!vboxGlobal().launchMachine(machine, VBoxGlobal::LaunchMode_Separate))
+            return false;
+    }
+
     /* Create machine UI: */
     new UIMachine;
@@ -217 +229 @@
 bool UIMachine::prepare()
 {
-    KLockType lockType;
-    if (!vboxGlobal().isSeparateProcess())
-    {
-        lockType = KLockType_VM;
-    }
-    else
-    {
-        /* Try to find corresponding machine: */
-        CVirtualBox virtualBox = vboxGlobal().virtualBox();
-        CMachine machine = virtualBox.FindMachine(vboxGlobal().managedVMUuid());
-        if (machine.isNull())
-        {
-            msgCenter().cannotFindMachineById(virtualBox, vboxGlobal().managedVMUuid());
-            return false;
-        }
-
-        /* Try to launch corresponding machine: */
-        if (!vboxGlobal().launchMachine(machine, VBoxGlobal::LaunchMode_Separate))
-            return false;
-
-        lockType = KLockType_Shared;
-    }
-
     /* Create VM session: */
-    m_session = vboxGlobal().openSession(vboxGlobal().managedVMUuid(), lockType);
+    m_session = vboxGlobal().openSession(vboxGlobal().managedVMUuid(),
+                                         vboxGlobal().isSeparateProcess() ? KLockType_Shared : KLockType_VM);
     if (m_session.isNull())
         return false;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.h

@@ -85 +85 @@
     /** Prepare routine: Loading stuff. */
     void loadSettings();
-    /** Prepare routine: Saving stuff. */
+    /** Cleanup routine: Saving stuff. */
     void saveSettings();
     /** Cleanup routine. */