X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.cpp;h=018e4a2733fca8f813efeff6f9b9c0fd1dd6a9f6;hp=26e01d05828858e1e1e1e00df28ee3162f5c3018;hb=2b3dda54bb8e390e6a5d378c0e88f2bafacf0870;hpb=558ad6ceb934ab7406d286c1a4ae08da4aba1448

diff --git a/pv/data/signalbase.cpp b/pv/data/signalbase.cpp
index 26e01d05..018e4a27 100644
--- a/pv/data/signalbase.cpp
+++ b/pv/data/signalbase.cpp
@@ -542,13 +542,19 @@ void SignalBase::conversion_thread_proc()
 	if (conversion_is_a2l()) {
 		analog_data = dynamic_pointer_cast<Analog>(data_);
 
-		if (analog_data->analog_segments().size() == 0)
-			return;
+		if (analog_data->analog_segments().size() == 0) {
+			unique_lock<mutex> input_lock(conversion_input_mutex_);
+			conversion_input_cond_.wait(input_lock);
+		}
 
 	} else
 		// Currently, we only handle A2L conversions
 		return;
 
+	// If we had to wait for input data, we may have been notified to terminate
+	if (conversion_interrupt_)
+		return;
+
 	uint32_t segment_id = 0;
 
 	AnalogSegment *asegment = analog_data->analog_segments().front().get();