X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Flogicsignal.cpp;h=c58b85d9857a2a622c6e7cf51b3674be7b77a48a;hb=77817b43ee7cf9f65d1d1fb8e71495347bd925fd;hp=aa581d0a4955351c0738b00ba0fb396c9da3eb64;hpb=aa5e914074b759c82974d1096f22164481eec006;p=pulseview.git

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index aa581d0..c58b85d 100644
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -272,6 +272,18 @@ void LogicSignal::init_trigger_actions(QWidget *parent)
 	connect(trigger_change_, SIGNAL(triggered()), this, SLOT(on_trigger()));
 }
 
+const vector<int32_t> LogicSignal::get_trigger_types() const
+{
+	try {
+		const Glib::VariantContainerBase gvar =
+			device_->config_list(ConfigKey::TRIGGER_MATCH);
+		return Glib::VariantBase::cast_dynamic<
+			Glib::Variant<vector<int32_t>>>(gvar).get();
+	} catch (Error e) {
+		return vector<int32_t>();
+	}
+}
+
 QAction* LogicSignal::action_from_trigger_type(const TriggerMatchType *type)
 {
 	QAction *action;
@@ -320,24 +332,14 @@ const TriggerMatchType *LogicSignal::trigger_type_from_action(QAction *action)
 
 void LogicSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
 {
-	Glib::VariantContainerBase gvar;
-	vector<int32_t> trig_types;
-
 	Signal::populate_popup_form(parent, form);
 
-	try {
-		gvar = device_->config_list(ConfigKey::TRIGGER_MATCH);
-	} catch (Error e) {
-		return;
-	}
-
 	trigger_bar_ = new QToolBar(parent);
 	init_trigger_actions(trigger_bar_);
 	trigger_bar_->addAction(trigger_none_);
 	trigger_none_->setChecked(!trigger_match_);
-	trig_types =
-		Glib::VariantBase::cast_dynamic<Glib::Variant<vector<int32_t>>>(
-			gvar).get();
+
+	const vector<int32_t> trig_types = get_trigger_types();
 	for (auto type_id : trig_types) {
 		const TriggerMatchType *const type =
 			TriggerMatchType::get(type_id);