DecodeSignal: Ignore decode signals when restoring channel assignment

diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp
index 28157794208c6fbf4a7b65be20b76773bb21b189..98275bad4b5f3fb17c84830ad916f5d3906ae533 100644 (file)
--- a/pv/data/decodesignal.cpp
+++ b/pv/data/decodesignal.cpp
@@ -822,7 +822,7 @@ void DecodeSignal::restore_settings(QSettings &settings)
                QString assigned_signal_name = settings.value("assigned_signal_name").toString();
 
                for (const shared_ptr<data::SignalBase>& signal : signalbases)
                QString assigned_signal_name = settings.value("assigned_signal_name").toString();
 
                for (const shared_ptr<data::SignalBase>& signal : signalbases)

-                       if (signal->name() == assigned_signal_name)
+                       if ((signal->name() == assigned_signal_name) && (signal->type() != SignalBase::DecodeChannel))

                                channel->assigned_signal = signal.get();
 
                channel->initial_pin_state = settings.value("initial_pin_state").toInt();
                                channel->assigned_signal = signal.get();
 
                channel->initial_pin_state = settings.value("initial_pin_state").toInt();