Session: Save/restore channel info and top-level decoder

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

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index a8de4d504aaa36b0fdb9960fb4f5b72c5b2391ae..8dd329e0f7fd947c08717068e58dd4999307c827 100644 (file)
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -68,6 +68,9 @@ Signal::Signal(pv::Session &session,
        name_widget_(nullptr)
 {
        assert(base_);
+
+       connect(base_.get(), SIGNAL(enabled_changed(bool)),
+               this, SLOT(on_enabled_changed(bool)));
 }
 
 void Signal::set_name(QString name)
@@ -83,14 +86,6 @@ bool Signal::enabled() const
        return base_->enabled();
 }
 
-void Signal::enable(bool enable)
-{
-       base_->set_enabled(enable);
-
-       if (owner_)
-               owner_->extents_changed(true, true);
-}
-
 shared_ptr<data::SignalBase> Signal::base() const
 {
        return base_;
@@ -154,6 +149,11 @@ void Signal::delete_pressed()
 
 void Signal::on_name_changed(const QString &text)
 {
+       // On startup, this event is fired when a session restores signal
+       // names. However, the name widget hasn't yet been created.
+       if (!name_widget_)
+               return;
+
        if (text != name_widget_->currentText())
                name_widget_->setEditText(text);
 
@@ -162,7 +162,15 @@ void Signal::on_name_changed(const QString &text)
 
 void Signal::on_disable()
 {
-       enable(false);
+       base_->set_enabled(false);
+}
+
+void Signal::on_enabled_changed(bool enabled)
+{
+       (void)enabled;
+
+       if (owner_)
+               owner_->extents_changed(true, true);
 }
 
 } // namespace view