X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fpopups%2Fchannels.cpp;h=9afc3b48952754047eecce46b3f7aefb2630beb8;hp=f6b5aa14e99317cb6d08e35f70d265e4ea5a6927;hb=c3a740dd5d095eb1cdf42e00df4d5a5c480ac5b3;hpb=722930c167711a4b59b4f4d5a9bab20d88b3f535

diff --git a/pv/popups/channels.cpp b/pv/popups/channels.cpp
index f6b5aa1..9afc3b4 100644
--- a/pv/popups/channels.cpp
+++ b/pv/popups/channels.cpp
@@ -35,7 +35,9 @@
 
 using namespace Qt;
 
+using std::lock_guard;
 using std::map;
+using std::mutex;
 using std::set;
 using std::shared_ptr;
 using std::vector;
@@ -65,7 +67,9 @@ Channels::Channels(SigSession &session, QWidget *parent) :
 
 	// Collect a set of signals
 	map<shared_ptr<Channel>, shared_ptr<Signal> > signal_map;
-	const vector< shared_ptr<Signal> > sigs = _session.get_signals();
+
+	lock_guard<mutex> lock(_session.signals_mutex());
+	const vector< shared_ptr<Signal> > &sigs(_session.signals());
 
 	for (const shared_ptr<Signal> &sig : sigs)
 		signal_map[sig->channel()] = sig;