Changeset 59288 in vbox for trunk/src/VBox/Main

Timestamp:

Jan 8, 2016 10:43:59 AM (9 years ago)

Author:

vboxsync

Message:

Main: fix for VBOX_WITH_VUSB disabled

File:

• trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -1879 +1879 @@
          */
         com::SafeIfaceArray<IUSBController> usbCtrls;
-        hrc = pMachine->COMGETTER(USBControllers)(ComSafeArrayAsOutParam(usbCtrls));        H();
+        hrc = pMachine->COMGETTER(USBControllers)(ComSafeArrayAsOutParam(usbCtrls));
         bool fOhciPresent = false; /**< Flag whether at least one OHCI controller is present. */
         bool fXhciPresent = false; /**< Flag whether at least one XHCI controller is present. */
 
-        for (size_t i = 0; i < usbCtrls.size(); ++i)
-        {
-            USBControllerType_T enmCtrlType;
-            rc = usbCtrls[i]->COMGETTER(Type)(&enmCtrlType);                                   H();
-            if (enmCtrlType == USBControllerType_OHCI)
-            {
-                fOhciPresent = true;
-                break;
-            }
-            else if (enmCtrlType == USBControllerType_XHCI)
-            {
-                fXhciPresent = true;
-                break;
-            }
+        if (SUCCEEDED(hrc))
+        {
+            for (size_t i = 0; i < usbCtrls.size(); ++i)
+            {
+                USBControllerType_T enmCtrlType;
+                rc = usbCtrls[i]->COMGETTER(Type)(&enmCtrlType);                                   H();
+                if (enmCtrlType == USBControllerType_OHCI)
+                {
+                    fOhciPresent = true;
+                    break;
+                }
+                else if (enmCtrlType == USBControllerType_XHCI)
+                {
+                    fXhciPresent = true;
+                    break;
+                }
+            }
+        }
+        else if (hrc != E_NOTIMPL)
+        {
+            H();
         }