X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.cpp;h=648b4cf57917a0cf3ea0a608942b1313c88719a6;hb=f420385094dc7392e6bcec494d800f1d4b34f082;hp=6f1eb1925dc3e34fe59e35e3343cb5f0e93e7fd0;hpb=04394ded8776d2163c1e815ccc8170b81d76b028;p=pulseview.git diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp index 6f1eb19..648b4cf 100644 --- a/pv/data/decoderstack.cpp +++ b/pv/data/decoderstack.cpp @@ -191,9 +191,6 @@ void DecoderStack::clear() void DecoderStack::begin_decode() { - shared_ptr signalbase; - shared_ptr data; - if (decode_thread_.joinable()) { interrupt_ = true; input_cond_.notify_one(); @@ -242,10 +239,13 @@ void DecoderStack::begin_decode() // We get the logic data of the first channel in the list. // This works because we are currently assuming all // logic signals have the same data/segment + pv::data::SignalBase *signalbase; + pv::data::Logic *data = nullptr; + for (const shared_ptr &dec : stack_) if (dec && !dec->channels().empty() && - ((signalbase = (*dec->channels().begin()).second)) && - ((data = signalbase->logic_data()))) + ((signalbase = (*dec->channels().begin()).second.get())) && + ((data = signalbase->logic_data().get()))) break; if (!data)