X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fpopups%2Fchannels.cpp;h=9afc3b48952754047eecce46b3f7aefb2630beb8;hp=f93734a1f10ed71d372bbc741503502a22191126;hb=c3a740dd5d095eb1cdf42e00df4d5a5c480ac5b3;hpb=d260d425863efa6d80a5a5f3d920373a6d159aef

diff --git a/pv/popups/channels.cpp b/pv/popups/channels.cpp
index f93734a1..9afc3b48 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;
@@ -183,7 +187,7 @@ QGridLayout* Channels::create_channel_group_grid(
 	{
 		assert(sig);
 
-		QCheckBox *const checkbox = new QCheckBox(sig->get_name());
+		QCheckBox *const checkbox = new QCheckBox(sig->name());
 		_check_box_mapper.setMapping(checkbox, checkbox);
 		connect(checkbox, SIGNAL(toggled(bool)),
 			&_check_box_mapper, SLOT(map()));