X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=d21b75ab3f432422977b77d1d79056cdec1dc547;hb=75663e3ab6656ed9fc39050d8ac6752450b6a4ad;hp=6d366e7311881b8736b80daf2709becd72d7c88b;hpb=cc88566ce77bed57358a82dec5da648feb66d10b;p=pulseview.git diff --git a/pv/view/view.cpp b/pv/view/view.cpp index 6d366e73..d21b75ab 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -396,8 +396,7 @@ void View::set_scale_offset(double scale, const Timestamp& offset) set< shared_ptr > View::get_visible_data() const { - shared_lock lock(session().signals_mutex()); - const unordered_set< shared_ptr > &sigs(session().signals()); + const unordered_set< shared_ptr > sigs(session().signals()); // Make a set of all the visible data objects set< shared_ptr > visible_data; @@ -745,8 +744,7 @@ void View::determine_time_unit() { // Check whether we know the sample rate and hence can use time as the unit if (time_unit_ == util::TimeUnit::Samples) { - shared_lock lock(session().signals_mutex()); - const unordered_set< shared_ptr > &sigs(session().signals()); + const unordered_set< shared_ptr > sigs(session().signals()); // Check all signals but... for (const shared_ptr signal : sigs) { @@ -885,8 +883,7 @@ void View::signals_changed() const set> prev_traces( prev_trace_list.begin(), prev_trace_list.end()); - shared_lock lock(session_.signals_mutex()); - const unordered_set< shared_ptr > &sigs(session_.signals()); + const unordered_set< shared_ptr > sigs(session_.signals()); set< shared_ptr > traces(sigs.begin(), sigs.end());