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

Timestamp:

May 4, 2010 8:23:10 AM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

61020

Message:

FE/Qt4: new core: fix usb availability checking

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UISession.cpp (modified) (1 diff)
• normal/UIMachineWindowNormal.cpp (modified) (1 diff)

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

@@ -1477 +1477 @@
 {
     /* Get uisession machine: */
-    CMachine machine = session().GetConsole().GetMachine();
+    const CMachine &machine = session().GetConsole().GetMachine();
 
     /* Availability settings: */
     {
         /* USB Stuff: */
-        CUSBController usbController = machine.GetUSBController();
+        const CUSBController &usbController = machine.GetUSBController();
         if (   usbController.isNull()
+            || !usbController.GetEnabled()
             || !usbController.GetProxyAvailable())
         {

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp

@@ -556 +556 @@
     {
         /* USB Stuff: */
-        CUSBController usbController = machine.GetUSBController();
-        if (usbController.isNull())
+        const CUSBController &usbController = machine.GetUSBController();
+        if (    usbController.isNull()
+            || !usbController.GetEnabled()
+            || !usbController.GetProxyAvailable())
         {
             /* Hide USB Menu: */