From 0ce9035e0ae79179543a2f965c98b533e760c6e1 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Wed, 21 Feb 2018 13:50:50 +0100
Subject: [PATCH] Web API: fixed webapiSettingsGet not initializing own channel
 or device structure

---
 plugins/channelrx/demodnfm/nfmdemod.cpp             | 1 +
 plugins/channeltx/modnfm/nfmmod.cpp                 | 1 +
 plugins/samplesink/hackrfoutput/hackrfoutput.cpp    | 1 +
 plugins/samplesink/limesdroutput/limesdroutput.cpp  | 1 +
 plugins/samplesource/filesource/filesourceinput.cpp | 2 +-
 plugins/samplesource/hackrfinput/hackrfinput.cpp    | 1 +
 plugins/samplesource/limesdrinput/limesdrinput.cpp  | 1 +
 plugins/samplesource/rtlsdr/rtlsdrinput.cpp         | 1 +
 8 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/plugins/channelrx/demodnfm/nfmdemod.cpp b/plugins/channelrx/demodnfm/nfmdemod.cpp
index 0054c0383..0a097bee0 100644
--- a/plugins/channelrx/demodnfm/nfmdemod.cpp
+++ b/plugins/channelrx/demodnfm/nfmdemod.cpp
@@ -544,6 +544,7 @@ int NFMDemod::webapiSettingsGet(
             QString& errorMessage __attribute__((unused)))
 {
     response.setNfmDemodSettings(new SWGSDRangel::SWGNFMDemodSettings());
+    response.getNfmDemodSettings()->init();
     webapiFormatChannelSettings(response, m_settings);
     return 200;
 }
diff --git a/plugins/channeltx/modnfm/nfmmod.cpp b/plugins/channeltx/modnfm/nfmmod.cpp
index 797084d5f..4a3c9d825 100644
--- a/plugins/channeltx/modnfm/nfmmod.cpp
+++ b/plugins/channeltx/modnfm/nfmmod.cpp
@@ -507,6 +507,7 @@ int NFMMod::webapiSettingsGet(
                 QString& errorMessage __attribute__((unused)))
 {
     response.setNfmModSettings(new SWGSDRangel::SWGNFMModSettings());
+    response.getNfmModSettings()->init();
     webapiFormatChannelSettings(response, m_settings);
     return 200;
 }
diff --git a/plugins/samplesink/hackrfoutput/hackrfoutput.cpp b/plugins/samplesink/hackrfoutput/hackrfoutput.cpp
index 4d8d51bdf..9ba53ffe7 100644
--- a/plugins/samplesink/hackrfoutput/hackrfoutput.cpp
+++ b/plugins/samplesink/hackrfoutput/hackrfoutput.cpp
@@ -473,6 +473,7 @@ int HackRFOutput::webapiSettingsGet(
                 QString& errorMessage __attribute__((unused)))
 {
     response.setHackRfOutputSettings(new SWGSDRangel::SWGHackRFOutputSettings());
+    response.getHackRfOutputSettings()->init();
     webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }
diff --git a/plugins/samplesink/limesdroutput/limesdroutput.cpp b/plugins/samplesink/limesdroutput/limesdroutput.cpp
index 45536df30..879c9ef7a 100644
--- a/plugins/samplesink/limesdroutput/limesdroutput.cpp
+++ b/plugins/samplesink/limesdroutput/limesdroutput.cpp
@@ -1111,6 +1111,7 @@ int LimeSDROutput::webapiSettingsGet(
                 QString& errorMessage __attribute__((unused)))
 {
     response.setLimeSdrOutputSettings(new SWGSDRangel::SWGLimeSdrOutputSettings());
+    response.getLimeSdrOutputSettings()->init();
     webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }
diff --git a/plugins/samplesource/filesource/filesourceinput.cpp b/plugins/samplesource/filesource/filesourceinput.cpp
index b5de252ed..7a14df424 100644
--- a/plugins/samplesource/filesource/filesourceinput.cpp
+++ b/plugins/samplesource/filesource/filesourceinput.cpp
@@ -353,7 +353,7 @@ int FileSourceInput::webapiSettingsGet(
                 QString& errorMessage __attribute__((unused)))
 {
     response.setFileSourceSettings(new SWGSDRangel::SWGFileSourceSettings());
-    *response.getFileSourceSettings()->getFileName() = m_settings.m_fileName;
+    response.getFileSourceSettings()->setFileName(new QString(m_settings.m_fileName));
     return 200;
 }
 
diff --git a/plugins/samplesource/hackrfinput/hackrfinput.cpp b/plugins/samplesource/hackrfinput/hackrfinput.cpp
index fee02e041..399c30443 100644
--- a/plugins/samplesource/hackrfinput/hackrfinput.cpp
+++ b/plugins/samplesource/hackrfinput/hackrfinput.cpp
@@ -553,6 +553,7 @@ int HackRFInput::webapiSettingsGet(
                 QString& errorMessage __attribute__((unused)))
 {
     response.setHackRfInputSettings(new SWGSDRangel::SWGHackRFInputSettings());
+    response.getHackRfInputSettings()->init();
     webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }
diff --git a/plugins/samplesource/limesdrinput/limesdrinput.cpp b/plugins/samplesource/limesdrinput/limesdrinput.cpp
index d2acb00cf..43fd1c970 100644
--- a/plugins/samplesource/limesdrinput/limesdrinput.cpp
+++ b/plugins/samplesource/limesdrinput/limesdrinput.cpp
@@ -1265,6 +1265,7 @@ int LimeSDRInput::webapiSettingsGet(
                 QString& errorMessage __attribute__((unused)))
 {
     response.setLimeSdrInputSettings(new SWGSDRangel::SWGLimeSdrInputSettings());
+    response.getLimeSdrInputSettings()->init();
     webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }
diff --git a/plugins/samplesource/rtlsdr/rtlsdrinput.cpp b/plugins/samplesource/rtlsdr/rtlsdrinput.cpp
index 1a36da5f7..d6c1947da 100644
--- a/plugins/samplesource/rtlsdr/rtlsdrinput.cpp
+++ b/plugins/samplesource/rtlsdr/rtlsdrinput.cpp
@@ -554,6 +554,7 @@ int RTLSDRInput::webapiSettingsGet(
                 QString& errorMessage __attribute__((unused)))
 {
     response.setRtlSdrSettings(new SWGSDRangel::SWGRtlSdrSettings());
+    response.getRtlSdrSettings()->init();
     webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }