From 63d94ac9a171e71be8f460dec2a14c9f3394e135 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Sat, 7 Oct 2017 06:04:05 +0200
Subject: [PATCH] UDP source: fixed settings passing

---
 plugins/channelrx/udpsrc/udpsrc.cpp | 35 ++++++++++++++++-------------
 plugins/channelrx/udpsrc/udpsrc.h   |  3 ++-
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/plugins/channelrx/udpsrc/udpsrc.cpp b/plugins/channelrx/udpsrc/udpsrc.cpp
index 8850cbca3..8b81d3d1f 100644
--- a/plugins/channelrx/udpsrc/udpsrc.cpp
+++ b/plugins/channelrx/udpsrc/udpsrc.cpp
@@ -397,21 +397,21 @@ bool UDPSrc::handleMessage(const Message& cmd)
         settings.m_inputSampleRate = m_settings.m_inputSampleRate;
         settings.m_inputFrequencyOffset = m_settings.m_inputFrequencyOffset;
 
-        m_config.m_audioActive = m_settings.m_audioActive;
-        m_config.m_audioStereo = m_settings.m_audioStereo;
-        m_config.m_gain = m_settings.m_gain;
-        m_config.m_volume = m_settings.m_volume;
-        m_config.m_squelch = CalcDb::powerFromdB((double) m_settings.m_squelchdB);
-        m_config.m_squelchGate = m_settings.m_squelchGate;
-        m_config.m_squelchEnabled = m_settings.m_squelchEnabled;
-        m_config.m_agc = m_settings.m_agc;
-        m_config.m_sampleFormat = m_settings.m_sampleFormat;
-        m_config.m_outputSampleRate = m_settings.m_outputSampleRate;
-        m_config.m_rfBandwidth = m_settings.m_rfBandwidth;
-        m_config.m_udpAddressStr = m_settings.m_udpAddress;
-        m_config.m_udpPort = m_settings.m_udpPort;
-        m_config.m_audioPort = m_settings.m_audioPort;
-        m_config.m_fmDeviation = m_settings.m_fmDeviation;
+        m_config.m_audioActive = settings.m_audioActive;
+        m_config.m_audioStereo = settings.m_audioStereo;
+        m_config.m_gain = settings.m_gain;
+        m_config.m_volume = settings.m_volume;
+        m_config.m_squelch = CalcDb::powerFromdB((double) settings.m_squelchdB);
+        m_config.m_squelchGate = settings.m_squelchGate;
+        m_config.m_squelchEnabled = settings.m_squelchEnabled;
+        m_config.m_agc = settings.m_agc;
+        m_config.m_sampleFormat = settings.m_sampleFormat;
+        m_config.m_outputSampleRate = settings.m_outputSampleRate;
+        m_config.m_rfBandwidth = settings.m_rfBandwidth;
+        m_config.m_udpAddressStr = settings.m_udpAddress;
+        m_config.m_udpPort = settings.m_udpPort;
+        m_config.m_audioPort = settings.m_audioPort;
+        m_config.m_fmDeviation = settings.m_fmDeviation;
 
         apply(cfg.getForce());
 
@@ -421,9 +421,10 @@ bool UDPSrc::handleMessage(const Message& cmd)
                 << " m_audioActive: " << m_config.m_audioActive
                 << " m_audioStereo: " << m_config.m_audioStereo
                 << " m_gain: " << m_config.m_gain
+                << " m_volume: " << m_config.m_volume
                 << " m_squelchEnabled: " << m_config.m_squelchEnabled
                 << " m_squelch: " << m_config.m_squelch
-                << " getSquelchDB: " << m_settings.m_squelchdB
+                << " getSquelchDB: " << settings.m_squelchdB
                 << " m_squelchGate" << m_config.m_squelchGate
                 << " m_agc" << m_config.m_agc
                 << " m_sampleFormat: " << m_config.m_sampleFormat
@@ -435,6 +436,8 @@ bool UDPSrc::handleMessage(const Message& cmd)
                 << " m_audioPort: " << m_config.m_audioPort
                 << " force: " << cfg.getForce();
 
+        m_settings = settings;
+
         return true;
     }
 	else if (MsgUDPSrcConfigureImmediate::match(cmd))
diff --git a/plugins/channelrx/udpsrc/udpsrc.h b/plugins/channelrx/udpsrc/udpsrc.h
index 3f30ebc86..01002e5f2 100644
--- a/plugins/channelrx/udpsrc/udpsrc.h
+++ b/plugins/channelrx/udpsrc/udpsrc.h
@@ -63,7 +63,8 @@ public:
             Message(),
             m_settings(settings),
             m_force(force)
-        { }
+        {
+        }
     };
 
     class MsgConfigureChannelizer : public Message {