X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fpopups%2Fprobes.cpp;h=a20dfccafb4f345c51d76147f69a2f4852245bde;hb=e9213170687cf4afd14e20acdc690ff9381d94ae;hp=f8fa970e0e7a7accff89b2ff4440e8a19ae45df4;hpb=f9abf97e78bc4825d80926b0ebc6cbaef40768b1;p=pulseview.git diff --git a/pv/popups/probes.cpp b/pv/popups/probes.cpp index f8fa970..a20dfcc 100644 --- a/pv/popups/probes.cpp +++ b/pv/popups/probes.cpp @@ -63,6 +63,7 @@ Probes::Probes(SigSession &session, QWidget *parent) : // Collect a set of signals map > signal_map; const vector< shared_ptr > sigs = _session.get_signals(); + for (const shared_ptr &sig : sigs) signal_map[sig->probe()] = sig; @@ -73,7 +74,7 @@ Probes::Probes(SigSession &session, QWidget *parent) : (const sr_channel_group*)g->data; assert(group); - // Make a set of signals, and removed this signals from the + // Make a set of signals and remove these signals from the // signal map. vector< shared_ptr > group_sigs; for (const GSList *p = group->channels; p; p = p->next) @@ -82,7 +83,9 @@ Probes::Probes(SigSession &session, QWidget *parent) : assert(probe); const auto iter = signal_map.find(probe); - assert(iter != signal_map.end()); + + if (iter == signal_map.end()) + break; group_sigs.push_back((*iter).second); signal_map.erase(iter);