Backport recent changes from mainline.

[pulseview.git] / pv / devices / hardwaredevice.cpp

diff --git a/pv/devices/hardwaredevice.cpp b/pv/devices/hardwaredevice.cpp
index ff52f817327d6d0d5790c91675e764d1d6091212..a3d84d6fadf175973fab3a2a420f190838948fc2 100644 (file)
--- a/pv/devices/hardwaredevice.cpp
+++ b/pv/devices/hardwaredevice.cpp
@@ -54,8 +54,15 @@ HardwareDevice::~HardwareDevice()
 
 string HardwareDevice::full_name() const
 {
-       vector<string> parts = {device_->vendor(), device_->model(),
-               device_->version(), device_->serial_number()};
+       vector<string> parts = {};
+       if (device_->vendor().length() > 0)
+               parts.push_back(device_->vendor());
+       if (device_->model().length() > 0)
+               parts.push_back(device_->model());
+       if (device_->version().length() > 0)
+               parts.push_back(device_->version());
+       if (device_->serial_number().length() > 0)
+               parts.push_back("[S/N: " + device_->serial_number() + "]");
        if (device_->connection_id().length() > 0)
                parts.push_back("(" + device_->connection_id() + ")");
        return join(parts, " ");
@@ -84,11 +91,17 @@ string HardwareDevice::display_name(
                                dev->device_ != device_;
                });
 
-       vector<string> parts = {device_->vendor(), device_->model()};
+       vector<string> parts = {};
+       if (device_->vendor().length() > 0)
+               parts.push_back(device_->vendor());
+       if (device_->model().length() > 0)
+               parts.push_back(device_->model());
 
        if (multiple_dev) {
-               parts.push_back(device_->version());
-               parts.push_back(device_->serial_number());
+               if (device_->version().length() > 0)
+                       parts.push_back(device_->version());
+               if (device_->serial_number().length() > 0)
+                       parts.push_back("[S/N: " + device_->serial_number() + "]");
 
                if ((device_->serial_number().length() == 0) &&
                        (device_->connection_id().length() > 0))