From fa1e772383f5a0dfe9bf23a623ac1c1826935fb6 Mon Sep 17 00:00:00 2001 From: f4exb Date: Thu, 28 Dec 2017 03:29:26 +0100 Subject: [PATCH] NFM mod: fixed deserializer --- plugins/channeltx/modnfm/nfmmod.cpp | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/plugins/channeltx/modnfm/nfmmod.cpp b/plugins/channeltx/modnfm/nfmmod.cpp index c7658d317..2dc199074 100644 --- a/plugins/channeltx/modnfm/nfmmod.cpp +++ b/plugins/channeltx/modnfm/nfmmod.cpp @@ -474,19 +474,22 @@ QByteArray NFMMod::serialize() const bool NFMMod::deserialize(const QByteArray& data) { - if (m_settings.deserialize(data)) - { - MsgConfigureNFMMod *msg = MsgConfigureNFMMod::create(m_settings, true); - m_inputMessageQueue.push(msg); - return true; - } - else + bool success = true; + + if (!m_settings.deserialize(data)) { m_settings.resetToDefaults(); - MsgConfigureNFMMod *msg = MsgConfigureNFMMod::create(m_settings, true); - m_inputMessageQueue.push(msg); - return false; + success = false; } + + MsgConfigureChannelizer *msgChan = MsgConfigureChannelizer::create( + 48000, m_settings.m_inputFrequencyOffset); + m_inputMessageQueue.push(msgChan); + + MsgConfigureNFMMod *msg = MsgConfigureNFMMod::create(m_settings, true); + m_inputMessageQueue.push(msg); + + return success; } int NFMMod::webapiSettingsGet(