X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.cpp;h=e258f6db8e189fb410bcd696d123f31fb295f40e;hp=4edba0f7a2de9c5f428e9f07fe38d7532e69ad1e;hb=cbb50547a69f8a10dd05e8cf8d03fdd679e4442f;hpb=e771b42d654ecb1e8e4d6ca60687c545461e3750 diff --git a/pv/session.cpp b/pv/session.cpp index 4edba0f7..e258f6db 100644 --- a/pv/session.cpp +++ b/pv/session.cpp @@ -91,6 +91,9 @@ using sigrok::Session; using Glib::VariantBase; namespace pv { + +shared_ptr Session::sr_context; + Session::Session(DeviceManager &device_manager, QString name) : device_manager_(device_manager), default_name_(name), @@ -316,9 +319,9 @@ void Session::restore_settings(QSettings &settings) int decode_signals = settings.value("decode_signals").toInt(); for (int i = 0; i < decode_signals; i++) { - settings.beginGroup("decode_signal" + QString::number(i++)); - // TODO Split up add_decoder() into add_decode_signal() and add_decoder(), - // then call add_decode_signal() and signal->restore_settings() here + settings.beginGroup("decode_signal" + QString::number(i)); + shared_ptr signal = add_decode_signal(); + signal->restore_settings(settings); settings.endGroup(); } #endif