X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.cpp;h=baef9ce191ddeebd7ea2a480e0e4957b19a5d460;hb=a8030bb06fd94fe10a462f84bb8f3a4f51b4a05d;hp=d60c53e48b6e8df403d7350deaf091d94e866740;hpb=7dd518b81be3a446017040dc758003d236e158ff;p=pulseview.git

diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp
index d60c53e4..baef9ce1 100644
--- a/pv/data/decodesignal.cpp
+++ b/pv/data/decodesignal.cpp
@@ -279,16 +279,33 @@ void DecodeSignal::auto_assign_signals(const shared_ptr<Decoder> dec)
 		if (ch.assigned_signal)
 			continue;
 
+		const QString ch_name = ch.name.toLower();
+
+		shared_ptr<data::SignalBase> match;
 		for (shared_ptr<data::SignalBase> s : session_.signalbases()) {
-			const QString ch_name = ch.name.toLower();
+			if (!s->enabled())
+				continue;
+
 			const QString s_name = s->name().toLower();
 
 			if (s->logic_data() &&
 				((ch_name.contains(s_name)) || (s_name.contains(ch_name)))) {
-				ch.assigned_signal = s.get();
-				new_assignment = true;
+				if (!match)
+					match = s;
+				else {
+					// Only replace an existing match if it matches more characters
+					int old_unmatched = ch_name.length() - match->name().length();
+					int new_unmatched = ch_name.length() - s->name().length();
+					if (abs(new_unmatched) < abs(old_unmatched))
+						match = s;
+				}
 			}
 		}
+
+		if (match) {
+			ch.assigned_signal = match.get();
+			new_assignment = true;
+		}
 	}
 
 	if (new_assignment) {
@@ -1020,9 +1037,12 @@ void DecodeSignal::start_srd_session()
 		terminate_srd_session();
 
 		// Metadata is cleared also, so re-set it
+		uint64_t samplerate = 0;
 		if (segments_.size() > 0)
+			samplerate = segments_.at(current_segment_id_).samplerate;
+		if (samplerate)
 			srd_session_metadata_set(srd_session_, SRD_CONF_SAMPLERATE,
-				g_variant_new_uint64(segments_.at(current_segment_id_).samplerate));
+				g_variant_new_uint64(samplerate));
 		for (const shared_ptr<decode::Decoder> &dec : stack_)
 			dec->apply_all_options();
 		srd_session_start(srd_session_);
@@ -1077,9 +1097,12 @@ void DecodeSignal::terminate_srd_session()
 		srd_session_terminate_reset(srd_session_);
 
 		// Metadata is cleared also, so re-set it
+		uint64_t samplerate = 0;
 		if (segments_.size() > 0)
+			samplerate = segments_.at(current_segment_id_).samplerate;
+		if (samplerate)
 			srd_session_metadata_set(srd_session_, SRD_CONF_SAMPLERATE,
-				g_variant_new_uint64(segments_.at(current_segment_id_).samplerate));
+				g_variant_new_uint64(samplerate));
 		for (const shared_ptr<decode::Decoder> &dec : stack_)
 			dec->apply_all_options();
 	}