VBox

Timestamp:

Mar 2, 2010 9:33:25 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt: IUSBController::proxyAvailable() fixes

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

-              r26908
+              r26977
         CUSBController ctl = aMachine.GetUSBController();
+        if (!ctl.isNull())
+        if (   !ctl.isNull()
+            && ctl.GetProxyAvailable())
+        {
             /* the USB controller may be unavailable (i.e. in VirtualBox OSE) */

-              r26964
+              r26977
         /* USB Stuff: */
         CUSBController usbController = machine.GetUSBController();
+        if (usbController.isNull())
+        {
+            /* Hide USB menu if controller is NULL: */
+        if (   usbController.isNull()
+            || !usbController.GetProxyAvailable())
+        {
+            /* Hide USB menu if controller is NULL or no USB proxy available: */
             uimachine()->actionsPool()->action(UIActionIndex_Menu_USBDevices)->setVisible(false);
+        }

-              r26714
+              r26977
             /* Check if USB is implemented */
+            if (ctl.isNull())
+            if (   ctl.isNull()
+                || !ctl.GetProxyAvailable())
                 return false;

-              r26714
+              r26977
     /* Enable the OHCI and EHCI controller by default for new VMs. (new in 2.2) */
     CUSBController usbController = m_Machine.GetUSBController();
+    if (!usbController.isNull())
+    if (   !usbController.isNull()
+        && usbController.GetProxyAvailable())
+    {
         usbController.SetEnabled(true);
 …
         m_Machine.SetKeyboardHidType(KKeyboardHidType_USBKeyboard);
         m_Machine.SetPointingHidType(KPointingHidType_USBMouse);
+        if (!usbController.isNull())
+            usbController.SetEnabled(true);
+    }

Note: See TracChangeset for help on using the changeset viewer.