X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.cpp;h=2a3ad14b56743b5d7adb5b152aa76cfd03320807;hp=1eff9119f319de72fb1bfde4d1f13ec93e7228d6;hb=c5f9553c0b1ccd134b0d8f37b1b6c31ef3be114c;hpb=65efd0258bc6a70806f7c832a32ac74ce489fa52

diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp
index 1eff9119..2a3ad14b 100644
--- a/pv/data/decodesignal.cpp
+++ b/pv/data/decodesignal.cpp
@@ -807,7 +807,8 @@ void DecodeSignal::logic_mux_proc()
 
 	// Create initial logic mux segment
 	shared_ptr<LogicSegment> output_segment =
-		make_shared<LogicSegment>(*logic_mux_data_, logic_mux_unit_size_, 0);
+		make_shared<LogicSegment>(*logic_mux_data_, segment_id,
+			logic_mux_unit_size_, 0);
 	logic_mux_data_->push_segment(output_segment);
 
 	output_segment->set_samplerate(get_input_samplerate(0));
@@ -847,7 +848,8 @@ void DecodeSignal::logic_mux_proc()
 				segment_id++;
 
 				output_segment =
-					make_shared<LogicSegment>(*logic_mux_data_, logic_mux_unit_size_, 0);
+					make_shared<LogicSegment>(*logic_mux_data_, segment_id,
+						logic_mux_unit_size_, 0);
 				logic_mux_data_->push_segment(output_segment);
 
 				output_segment->set_samplerate(get_input_samplerate(segment_id));
@@ -991,6 +993,7 @@ void DecodeSignal::start_srd_session()
 		if (!di) {
 			error_message_ = tr("Failed to create decoder instance");
 			srd_session_destroy(srd_session_);
+			srd_session_ = nullptr;
 			return;
 		}