X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.cpp;h=37956889e8554624139a26aebd74c90f484f750d;hb=1ec191ed5406f1a6a7acb54472c66e7dc0554c20;hp=339c85dd01dd0305879bce1dc88d3fde6d8ec6e3;hpb=a3ebd5561086f4fef6570b3ab5be0a5592724731;p=pulseview.git

diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp
index 339c85d..3795688 100644
--- a/pv/data/decodesignal.cpp
+++ b/pv/data/decodesignal.cpp
@@ -265,11 +265,16 @@ void DecodeSignal::auto_assign_signals()
 		if (ch.assigned_signal)
 			continue;
 
-		for (shared_ptr<data::SignalBase> s : session_.signalbases())
-			if (s->logic_data() && (ch.name.toLower().contains(s->name().toLower()))) {
+		for (shared_ptr<data::SignalBase> s : session_.signalbases()) {
+			const QString ch_name = ch.name.toLower();
+			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 (new_assignment) {
@@ -600,12 +605,12 @@ void DecodeSignal::logic_mux_proc()
 			} while (processed_samples < samples_to_process);
 		}
 
-		if (session_.get_capture_state() != Session::Stopped) {
+		if (samples_to_process == 0) {
 			// Wait for more input
 			unique_lock<mutex> logic_mux_lock(logic_mux_mutex_);
 			logic_mux_cond_.wait(logic_mux_lock);
 		}
-	} while ((session_.get_capture_state() != Session::Stopped) && !logic_mux_interrupt_);
+	} while (!logic_mux_interrupt_);
 
 	// No more input data and session is stopped, let the decode thread
 	// process any pending data, terminate and release the global SRD mutex
@@ -638,9 +643,11 @@ void DecodeSignal::query_input_metadata()
 				samplerate_valid = true;
 		}
 
-		// Wait until input data is available or an interrupt was requested
-		unique_lock<mutex> input_wait_lock(input_mutex_);
-		decode_input_cond_.wait(input_wait_lock);
+		if (!samplerate_valid) {
+			// Wait until input data is available or an interrupt was requested
+			unique_lock<mutex> input_wait_lock(input_mutex_);
+			decode_input_cond_.wait(input_wait_lock);
+		}
 	} while (!samplerate_valid && !decode_interrupt_);
 }