Changeset 45272 in vbox for trunk/src/VBox

Timestamp:

Apr 1, 2013 1:02:58 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Update to r84661.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp (modified) (2 diffs)

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

@@ -1746 +1746 @@
     /* Lock found machine to session: */
     machine.LockMachine(session, lockType);
+    if (!machine.isOk())
+    {
+        msgCenter().cannotOpenSession(machine);
+        session.detach();
+        return session;
+    }
+    else if (!mVBox.isOk())
+    {
+        msgCenter().cannotOpenSession(mVBox, machine);
+        session.detach();
+        return session;
+    }
 
     /* Pass the language ID as the property to the guest: */
@@ -1756 +1768 @@
         QLocale lang(VBoxGlobal::languageId());
         startedMachine.SetGuestPropertyValue("/VirtualBox/HostInfo/GUI/LanguageID", lang.name());
-    }
-
-    /* Show locking errors if any: */
-    if (!machine.isOk())
-    {
-        msgCenter().cannotOpenSession(machine);
-        session.detach();
-    }
-    else if (!mVBox.isOk())
-    {
-        msgCenter().cannotOpenSession(mVBox, machine);
-        session.detach();
     }