Changeset 52170 in vbox

Timestamp:

Jul 24, 2014 3:07:46 PM (11 years ago)

Author:

vboxsync

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

95217

Message:

Main/Host: make sure USB warnings are not lost when querying the USB device list or global filter list

File:

• trunk/src/VBox/Main/src-server/HostImpl.cpp (modified) (4 diffs)

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

@@ -792 +792 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    HRESULT rc = i_checkUSBProxyService();
+    MultiResult rc = i_checkUSBProxyService();
     if (FAILED(rc))
         return rc;
@@ -808 +808 @@
     }
 
-    return S_OK;
+    return rc;
 #else
     /* Note: The GUI depends on this method returning E_NOTIMPL with no
@@ -883 +883 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    HRESULT rc = i_checkUSBProxyService();
+    MultiResult rc = i_checkUSBProxyService();
     if (FAILED(rc))
         return rc;
@@ -892 +892 @@
         (*it).queryInterfaceTo(aUSBDeviceFilters[i].asOutParam());
 
-    return S_OK;
+    return rc;
 #else
     /* Note: The GUI depends on this method returning E_NOTIMPL with no