X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdevices%2Fhardwaredevice.cpp;h=a3d84d6fadf175973fab3a2a420f190838948fc2;hp=50cab7b09b7c6f2c63c63549c57f5491297baceb;hb=46ebcd3f6f85092a9eb6401f6f56cee8fa08131a;hpb=ab89256886a313bef5172191d3f8864415913012

diff --git a/pv/devices/hardwaredevice.cpp b/pv/devices/hardwaredevice.cpp
index 50cab7b0..a3d84d6f 100644
--- a/pv/devices/hardwaredevice.cpp
+++ b/pv/devices/hardwaredevice.cpp
@@ -54,8 +54,13 @@ HardwareDevice::~HardwareDevice()
 
 string HardwareDevice::full_name() const
 {
-	vector<string> parts = {device_->vendor(), device_->model(),
-		device_->version()};
+	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)
@@ -86,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("[S/N: " + 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))