From: Joel Holdsworth <redacted>
Date: Mon, 10 Feb 2014 21:28:07 +0000 (+0000)
Subject: Removed _session.get_device calls from LogicSignal
X-Git-Tag: pulseview-0.2.0~75
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=e80da8d9b7d81cc91ef0a4cc23533f26cc47d238;p=pulseview.git

Removed _session.get_device calls from LogicSignal
---

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 81ddd6e9..57a988c3 100644
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -248,10 +248,8 @@ void LogicSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
 	Signal::populate_popup_form(parent, form);
 
 	// Add the trigger actions
-	boost::shared_ptr<DevInst> dev_inst = _session.get_device();
-	assert(dev_inst);
-
-	if (!(gvar = dev_inst->list_config(NULL, SR_CONF_TRIGGER_TYPE)))
+	assert(_dev_inst);
+	if (!(gvar = _dev_inst->list_config(NULL, SR_CONF_TRIGGER_TYPE)))
 	{
 		const char *const trig_types =
 			g_variant_get_string(gvar, NULL);
@@ -305,10 +303,8 @@ void LogicSignal::set_trigger(char type)
 	const char *const trigger_string =
 		(type != 0) ? trigger_type_string : NULL;
 
-	boost::shared_ptr<DevInst> dev_inst = _session.get_device();
-	assert(dev_inst);
-
-	const sr_dev_inst *const sdi = dev_inst->dev_inst();
+	assert(_dev_inst);
+	const sr_dev_inst *const sdi = _dev_inst->dev_inst();
 	assert(sdi);
 
 	const int probe_count = g_slist_length(sdi->probes);