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

diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp
index d60c53e4..e70947b2 100644
--- a/pv/data/decodesignal.cpp
+++ b/pv/data/decodesignal.cpp
@@ -1020,9 +1020,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 +1080,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();
 	}