Changeset 89718 in vbox

Timestamp:

Jun 15, 2021 6:47:42 PM (3 years ago)

Author:

vboxsync

Message:

Main/Host+Machine: Fix warning handling in the USB related methods which should convey this level of detail (not needed everywhere). bugref:3582

Location:

trunk/src/VBox/Main/src-server

Files:

• HostImpl.cpp (modified) (2 diffs)
• MachineImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-server/HostImpl.cpp

@@ -1007 +1007 @@
 
     MultiResult rc = i_checkUSBProxyService();
-    if (FAILED(rc))
+    if (FAILED(rc) || SUCCEEDED_WARNING(rc))
         return rc;
 
@@ -3547 +3547 @@
             case VERR_FILE_NOT_FOUND:  /** @todo what does this mean? */
                 return setWarning(E_FAIL,
-                                  tr("Could not load the Host USB Proxy Service (VERR_FILE_NOT_FOUND). The service might not be installed on the host computer"));
+                                  tr("Could not load the Host USB Proxy Service (VERR_FILE_NOT_FOUND).  The service might not be installed on the host computer"));
             case VERR_VUSB_USB_DEVICE_PERMISSION:
                 return setWarning(E_FAIL,

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -13243 +13243 @@
     clearError();
     MultiResult rc = mParent->i_host()->i_checkUSBProxyService();
-    if (FAILED(rc)) return rc;
+    if (FAILED(rc) || SUCCEEDED_WARNING(rc))
+        return rc;
 
     USBProxyService *service = mParent->i_host()->i_usbProxyService();