X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.cpp;h=97f705084e91fc654c85ab7ce07cbfec64a3df50;hb=ef6cbaa21144ff25a74d5940bbe1c11ab2717e42;hp=3ce22ba2a286eb715af9628b8dec77e84365e2cc;hpb=66a43b4f9cf76853e99e7f5fc2f9df49ec58bd34;p=pulseview.git

diff --git a/pv/data/signalbase.cpp b/pv/data/signalbase.cpp
index 3ce22ba2..97f70508 100644
--- a/pv/data/signalbase.cpp
+++ b/pv/data/signalbase.cpp
@@ -590,7 +590,12 @@ 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)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+		bool is_qcolor = (QMetaType::Type)(value.typeId()) == QMetaType::QColor;
+#else
+		bool is_qcolor = (QMetaType::Type)(value.type()) == QMetaType::QColor;
+#endif
+		if (is_qcolor)
 			set_color(value.value<QColor>());
 		else
 			set_color(QColor::fromRgba(value.value<uint32_t>()));
@@ -723,6 +728,8 @@ void SignalBase::convert_single_segment_range(shared_ptr<AnalogSegment> asegment
 		delete[] lsamples;
 		delete[] asamples;
 	}
+
+	samples_added(lsegment->segment_id(), start_sample, end_sample);
 }
 
 void SignalBase::convert_single_segment(shared_ptr<AnalogSegment> asegment,