projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ed2cec6
)
Fix #777 by using a workaround for assumed glibmm bug
author
Soeren Apel
<soeren@apelpie.net>
Sun, 17 Apr 2016 13:29:09 +0000
(15:29 +0200)
committer
Soeren Apel
<soeren@apelpie.net>
Sun, 17 Apr 2016 13:29:09 +0000
(15:29 +0200)
pv/view/logicsignal.cpp
patch
|
blob
|
history
diff --git
a/pv/view/logicsignal.cpp
b/pv/view/logicsignal.cpp
index 3c85b9319083d4cb9c0e401a0fa949ed6513cb5f..6eb68db381357835fe8fc3feb1d0ff2fb95697a3 100644
(file)
--- a/
pv/view/logicsignal.cpp
+++ b/
pv/view/logicsignal.cpp
@@
-332,8
+332,20
@@
const vector<int32_t> LogicSignal::get_trigger_types() const
if (sr_dev->config_check(ConfigKey::TRIGGER_MATCH, Capability::LIST)) {
const Glib::VariantContainerBase gvar =
sr_dev->config_list(ConfigKey::TRIGGER_MATCH);
if (sr_dev->config_check(ConfigKey::TRIGGER_MATCH, Capability::LIST)) {
const Glib::VariantContainerBase gvar =
sr_dev->config_list(ConfigKey::TRIGGER_MATCH);
- return Glib::VariantBase::cast_dynamic<
- Glib::Variant<vector<int32_t>>>(gvar).get();
+
+ vector<int32_t> ttypes;
+
+ for (unsigned int i = 0; i < gvar.get_n_children(); i++) {
+ Glib::VariantBase tmp_vb;
+ gvar.get_child(tmp_vb, i);
+
+ Glib::Variant<int32_t> tmp_v =
+ Glib::VariantBase::cast_dynamic< Glib::Variant<int32_t> >(tmp_vb);
+
+ ttypes.push_back(tmp_v.get());
+ }
+
+ return ttypes;
} else {
return vector<int32_t>();
}
} else {
return vector<int32_t>();
}