X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.cpp;h=38cbecb85337500cf3c20ca5963aa769918bb728;hp=7bb62b2b288703c69dc9f725fad7cd43e071daf5;hb=3d79f521396c8e908fd237f5328153165099f5c3;hpb=ff59fa2c05db46e78c7fd0240223664fe0b2ad9b

diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index 7bb62b2b..38cbecb8 100644
--- a/pv/view/decodetrace.cpp
+++ b/pv/view/decodetrace.cpp
@@ -29,6 +29,8 @@ extern "C" {
 #include <tuple>
 
 #include <boost/functional/hash.hpp>
+#include <boost/thread/locks.hpp>
+#include <boost/thread/shared_mutex.hpp>
 
 #include <QAction>
 #include <QApplication>
@@ -525,7 +527,7 @@ pair<double, double> DecodeTrace::get_pixels_offset_samples_per_pixel() const
 	assert(scale > 0);
 
 	const double pixels_offset =
-		(view->offset() - decoder_stack_->start_time()) / scale;
+		((view->offset() - decoder_stack_->start_time()) / scale).convert_to<double>();
 
 	double samplerate = decoder_stack_->samplerate();
 
@@ -708,8 +710,7 @@ QComboBox* DecodeTrace::create_channel_selector(
 {
 	assert(dec);
 
-	shared_lock<shared_mutex> lock(session_.signals_mutex());
-	const auto &sigs(session_.signals());
+	const auto sigs(session_.signals());
 
 	vector< shared_ptr<Signal> > sig_list(sigs.begin(), sigs.end());
 	std::sort(sig_list.begin(), sig_list.end(),
@@ -747,8 +748,7 @@ void DecodeTrace::commit_decoder_channels(shared_ptr<data::decode::Decoder> &dec
 
 	map<const srd_channel*, shared_ptr<LogicSignal> > channel_map;
 
-	shared_lock<shared_mutex> lock(session_.signals_mutex());
-	const unordered_set< shared_ptr<Signal> > &sigs(session_.signals());
+	const unordered_set< shared_ptr<Signal> > sigs(session_.signals());
 
 	for (const ChannelSelector &s : channel_selectors_)
 	{