Random simplifications, cosmetics/whitespace/consistency fixes.

[pulseview.git] / pv / view / logicsignal.cpp

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index f78170b01a30a0028a95befaf7665e7d8a33e649..9c8f6b319cf7fbd1699b0810dea5ba17fe3bc753 100644 (file)
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -53,9 +53,7 @@ using std::vector;
 
 using sigrok::ConfigKey;
 using sigrok::Capability;
-using sigrok::Error;
 using sigrok::Trigger;
-using sigrok::TriggerStage;
 using sigrok::TriggerMatch;
 using sigrok::TriggerMatchType;
 
@@ -178,8 +176,7 @@ void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
        if (segments.empty())
                return;
 
-       const shared_ptr<pv::data::LogicSegment> &segment =
-               segments.front();
+       const shared_ptr<pv::data::LogicSegment> &segment = segments.front();
 
        double samplerate = segment->samplerate();
 
@@ -347,6 +344,10 @@ void LogicSignal::init_trigger_actions(QWidget *parent)
 
 const vector<int32_t> LogicSignal::get_trigger_types() const
 {
+       // We may not be associated with a device
+       if (!device_)
+               return vector<int32_t>();
+
        const auto sr_dev = device_->device();
        if (sr_dev->config_check(ConfigKey::TRIGGER_MATCH, Capability::LIST)) {
                const Glib::VariantContainerBase gvar =
@@ -393,7 +394,7 @@ QAction* LogicSignal::action_from_trigger_type(const TriggerMatchType *type)
                        action = trigger_change_;
                        break;
                default:
-                       assert(0);
+                       assert(false);
                }
        }