Fix comment and increase readability in probes.cpp

[pulseview.git] / pv / popups / probes.cpp

diff --git a/pv/popups/probes.cpp b/pv/popups/probes.cpp
index ada4d9a09ed64b58af4d0807d655975f5b9116fd..a20dfccafb4f345c51d76147f69a2f4852245bde 100644 (file)
--- a/pv/popups/probes.cpp
+++ b/pv/popups/probes.cpp
@@ -34,9 +34,9 @@
 
 using namespace Qt;
 
-using boost::shared_ptr;
 using std::map;
 using std::set;
+using std::shared_ptr;
 using std::vector;
 
 using pv::view::Signal;
@@ -63,6 +63,7 @@ Probes::Probes(SigSession &session, QWidget *parent) :
        // Collect a set of signals
        map<const sr_channel*, shared_ptr<Signal> > signal_map;
        const vector< shared_ptr<Signal> > sigs = _session.get_signals();
+
        for (const shared_ptr<Signal> &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<Signal> > 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);