Changeset 29607 in vbox for trunk/src/VBox

Timestamp:

May 18, 2010 9:44:38 AM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: fix the error handling in the case all is gone wrong when adding a USB device

File:

• trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -1771 +1771 @@
 {
     QString sDetails;
-    QString m = aDevice.GetManufacturer().trimmed();
-    QString p = aDevice.GetProduct().trimmed();
-    if (m.isEmpty() && p.isEmpty())
-    {
-        sDetails =
-            tr ("Unknown device %1:%2", "USB device details")
-            .arg (QString().sprintf ("%04hX", aDevice.GetVendorId()))
-            .arg (QString().sprintf ("%04hX", aDevice.GetProductId()));
-    }
+    if (aDevice.isNull())
+        sDetails = tr("Unknown device", "USB device details");
     else
     {
-        if (p.toUpper().startsWith (m.toUpper()))
-            sDetails = p;
+        QString m = aDevice.GetManufacturer().trimmed();
+        QString p = aDevice.GetProduct().trimmed();
+
+        if (m.isEmpty() && p.isEmpty())
+        {
+            sDetails =
+                tr ("Unknown device %1:%2", "USB device details")
+                .arg (QString().sprintf ("%04hX", aDevice.GetVendorId()))
+                .arg (QString().sprintf ("%04hX", aDevice.GetProductId()));
+        }
         else
-            sDetails = m + " " + p;
-    }
-    ushort r = aDevice.GetRevision();
-    if (r != 0)
-        sDetails += QString().sprintf (" [%04hX]", r);
+        {
+            if (p.toUpper().startsWith (m.toUpper()))
+                sDetails = p;
+            else
+                sDetails = m + " " + p;
+        }
+        ushort r = aDevice.GetRevision();
+        if (r != 0)
+            sDetails += QString().sprintf (" [%04hX]", r);
+    }
 
     return sDetails.trimmed();