X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=57a988c38e736fc908c99cbd0b64d337a871c910;hp=81ddd6e92ea4a925b0eb9d06e22b417d4f8f83cc;hb=e80da8d9b7d81cc91ef0a4cc23533f26cc47d238;hpb=8d3e0764def48fdf19dc9100c87bbb42da5a9d6d diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp index 81ddd6e..57a988c 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 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 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);