LogicSignal: Un-break trigger configuration. (bug #318)

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

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 7eb56da649b1ab2f68bf05c1819ffd017f5caeff..cc974f5210050729493a368b6e726d06ba86923f 100644 (file)
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -64,7 +64,7 @@ const QColor LogicSignal::SignalColours[10] = {
 };
 
 LogicSignal::LogicSignal(shared_ptr<pv::DevInst> dev_inst,
 };
 
 LogicSignal::LogicSignal(shared_ptr<pv::DevInst> dev_inst,

-       sr_probe *const probe, shared_ptr<data::Logic> data) :
+       const sr_probe *const probe, shared_ptr<data::Logic> data) :

        Signal(dev_inst, probe),
        _data(data),
        _trigger_none(NULL),
        Signal(dev_inst, probe),
        _data(data),
        _trigger_none(NULL),


@@ -248,7 +248,7 @@ void LogicSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
 
        // Add the trigger actions
        assert(_dev_inst);
 
        // Add the trigger actions
        assert(_dev_inst);

-       if (!(gvar = _dev_inst->list_config(NULL, SR_CONF_TRIGGER_TYPE)))
+       if ((gvar = _dev_inst->list_config(NULL, SR_CONF_TRIGGER_TYPE)))

        {
                const char *const trig_types =
                        g_variant_get_string(gvar, NULL);
        {
                const char *const trig_types =
                        g_variant_get_string(gvar, NULL);