X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.cpp;h=fde99e2b4619a3cadf2b2acd01a862759c183d3f;hb=86d4b8e3e52a422fe3a6956d6bbef27f1859717b;hp=670de49874326006f83b441074cc1d783c4767ae;hpb=6c892c63e9cece71466ea6e2459d00b50ba18352;p=pulseview.git

diff --git a/pv/data/signalbase.cpp b/pv/data/signalbase.cpp
index 670de498..fde99e2b 100644
--- a/pv/data/signalbase.cpp
+++ b/pv/data/signalbase.cpp
@@ -83,7 +83,7 @@ QString SignalBase::internal_name() const
 
 QString SignalBase::display_name() const
 {
-	if (name() != internal_name_)
+	if ((name() != internal_name_) && (!internal_name_.isEmpty()))
 		return name() + " (" + internal_name_ + ")";
 	else
 		return name();
@@ -474,10 +474,14 @@ void SignalBase::restore_settings(QSettings &settings)
 		QVariant value = settings.value("color");
 
 		// Workaround for Qt QColor serialization bug on OSX
-		if (((QMetaType::Type)(value.type()) == QMetaType::QColor) && value.isValid())
+		if ((QMetaType::Type)(value.type()) == QMetaType::QColor)
 			set_color(value.value<QColor>());
 		else
 			set_color(QColor::fromRgba(value.value<uint32_t>()));
+
+		// A color with an alpha value of 0 makes the signal marker invisible
+		if (color() == QColor(0, 0, 0, 0))
+			set_color(Qt::gray);
 	}
 
 	if (settings.contains("conversion_type"))