LogicSignal: Check the TRIGGER_MATCH key before listing

[pulseview.git] / pv / view / logicsignal.cpp

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 08a5225fa41f2f35cb4d7406ded8f96fc8727ec2..c6b7cffa361253495c2a2d7c541de7920660a292 100644 (file)
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -37,7 +37,7 @@
 #include <pv/data/logicsegment.hpp>
 #include <pv/view/view.hpp>
 
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 using std::deque;
 using std::max;
@@ -316,14 +316,22 @@ void LogicSignal::init_trigger_actions(QWidget *parent)
 
 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>();
+       const auto keys = device_->config_keys(ConfigKey::DEVICE_OPTIONS);
+       const auto iter = keys.find(ConfigKey::TRIGGER_MATCH);
+       if (iter != keys.end() &&
+               (*iter).second.find(sigrok::LIST) != (*iter).second.end()) {
+               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) {
+                       // Failed to enumerate triggers
+                       (void)e;
+               }
        }
+
+       return vector<int32_t>();
 }
 
 QAction* LogicSignal::action_from_trigger_type(const TriggerMatchType *type)