X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.cpp;h=2d9a6bf82227a3b50f59c3fa746a216fcc5e3ef5;hp=3ece1303ca513e5d40b6bc0d49848aa66dbea56c;hb=73a25a6e488f1813c1cd12da085a16e4f91ed4da;hpb=bf0edd2b0cbb5f4bd5d69b0f00bcea7d037e2287 diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp index 3ece130..2d9a6bf 100644 --- a/pv/view/decodetrace.cpp +++ b/pv/view/decodetrace.cpp @@ -851,8 +851,8 @@ QComboBox* DecodeTrace::create_channel_selector( vector< shared_ptr > sig_list(sigs.begin(), sigs.end()); std::sort(sig_list.begin(), sig_list.end(), [](const shared_ptr &a, const shared_ptr b) { - return strnatcasecmp(a->channel()->name().toStdString(), - b->channel()->name().toStdString()) < 0; }); + return strnatcasecmp(a->base()->name().toStdString(), + b->base()->name().toStdString()) < 0; }); assert(decoder_stack_); const auto channel_iter = dec->channels().find(pdch); @@ -867,7 +867,7 @@ QComboBox* DecodeTrace::create_channel_selector( for (const shared_ptr &s : sig_list) { assert(s); if (dynamic_pointer_cast(s) && s->enabled()) { - selector->addItem(s->channel()->name(), + selector->addItem(s->base()->name(), qVariantFromValue((void*)s.get())); if (channel_iter != dec->channels().end() &&