X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.cpp;h=648b4cf57917a0cf3ea0a608942b1313c88719a6;hb=f420385094dc7392e6bcec494d800f1d4b34f082;hp=d4daa5902a1d2a47d9f727da8dda74c5c6f5ef9c;hpb=add091eb7183fb399db139f29f3a0b4c85bd4273;p=pulseview.git diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp index d4daa59..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 logic_signal; - shared_ptr data; - if (decode_thread_.joinable()) { interrupt_ = true; input_cond_.notify_one(); @@ -241,11 +238,14 @@ void DecoderStack::begin_decode() // We get the logic data of the first channel in the list. // This works because we are currently assuming all - // LogicSignals have the same data/segment + // 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() && - ((logic_signal = (*dec->channels().begin()).second)) && - ((data = logic_signal->logic_data()))) + ((signalbase = (*dec->channels().begin()).second.get())) && + ((data = signalbase->logic_data().get()))) break; if (!data)