X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fpopups%2Fchannels.cpp;h=ea5f5fbed8d10c91c61dc1d39cca1826030ab81b;hb=bf9146988d2298e1750142dccdcf597ef13d6606;hp=d4ff6c9797cf6262a89b97df74b2dd65c7de05b3;hpb=4c60462b00cc329e61daedd1c2e66724077bd412;p=pulseview.git diff --git a/pv/popups/channels.cpp b/pv/popups/channels.cpp index d4ff6c9..ea5f5fb 100644 --- a/pv/popups/channels.cpp +++ b/pv/popups/channels.cpp @@ -20,6 +20,9 @@ #include +#include +#include + #include #include #include @@ -72,8 +75,7 @@ Channels::Channels(Session &session, QWidget *parent) : // Collect a set of signals map, shared_ptr > signal_map; - shared_lock lock(session_.signals_mutex()); - const unordered_set< shared_ptr > &sigs(session_.signals()); + const unordered_set< shared_ptr > sigs(session_.signals()); for (const shared_ptr &sig : sigs) signal_map[sig->channel()] = sig; @@ -200,7 +202,7 @@ QGridLayout* Channels::create_channel_group_grid( check_box_signal_map_[checkbox] = sig; - if(++col >= 8) + if (++col >= 8) col = 0, row++; }