Changeset 89867 in vbox for trunk/src

Timestamp:

Jun 23, 2021 4:33:18 PM (4 years ago)

Author:

vboxsync

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

145324

Message:

FE/Qt: bugref:3582. Showing a warning in vm UI in case USB enumeration fails

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• manager/UIVirtualBoxManager.cpp (modified) (1 diff)
• runtime/UISession.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -709 +709 @@
     if (!comHost.isOk())
         return;
-    if (comHost.GetUSBDevices().size() == 0 && comHost.isWarning())
+    if (comHost.GetUSBDevices().isEmpty() && comHost.isWarning())
         msgCenter().cannotEnumerateHostUSBDevices(comHost, this);
 }

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

@@ -62 +62 @@
 #include "CAudioAdapter.h"
 #include "CGraphicsAdapter.h"
+#include "CHostUSBDevice.h"
 #include "CRecordingSettings.h"
 #include "CSystemProperties.h"
@@ -1885 +1886 @@
 #endif /* VBOX_WITH_NETFLT */
 
+    /* Check for USB enumeration warning. Don't return false even if we have a warning: */
+    CHost comHost = uiCommon().host();
+    if (comHost.GetUSBDevices().isEmpty() && comHost.isWarning())
+        msgCenter().cannotEnumerateHostUSBDevices(comHost, activeMachineWindow());
+
     /* True by default: */
     return true;