X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsession.cpp;h=0ac5bb7286dbe2cd6c76dbd07ca967ec2d289176;hb=a3f678a7cad210fe796f4a76370996a1284da6d4;hp=da9c0e9bb4af998abf3a3303eb525536245b3ba9;hpb=48257a69ffad409c9893605d99cd6e15161dff4f;p=pulseview.git

diff --git a/pv/session.cpp b/pv/session.cpp
index da9c0e9..0ac5bb7 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -324,9 +324,14 @@ void Session::remove_decode_signal(view::DecodeTrace *signal)
 
 void Session::set_capture_state(capture_state state)
 {
-	lock_guard<mutex> lock(sampling_mutex_);
-	const bool changed = capture_state_ != state;
-	capture_state_ = state;
+	bool changed;
+
+	{
+		lock_guard<mutex> lock(sampling_mutex_);
+		changed = capture_state_ != state;
+		capture_state_ = state;
+	}
+
 	if (changed)
 		capture_state_changed(state);
 }
@@ -481,6 +486,11 @@ void Session::feed_in_meta(shared_ptr<Meta> meta)
 	for (auto entry : meta->config()) {
 		switch (entry.first->id()) {
 		case SR_CONF_SAMPLERATE:
+			// We can't rely on the header to always contain the sample rate,
+			// so in case it's supplied via a meta packet, we use it.
+			if (!cur_samplerate_)
+				cur_samplerate_ = g_variant_get_uint64(entry.second.gobj());
+
 			/// @todo handle samplerate changes
 			break;
 		default:
@@ -569,6 +579,10 @@ void Session::feed_in_analog(shared_ptr<Analog> analog)
 	const float *data = static_cast<const float *>(analog->data_pointer());
 	bool sweep_beginning = false;
 
+	if (signals_.empty()) {
+		update_signals();
+	}
+
 	for (auto channel : channels)
 	{
 		shared_ptr<data::AnalogSegment> segment;