From fc035ad8d5376bed7125162021e5aad2a2fecf46 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Tue, 18 May 2021 11:10:49 +0200
Subject: [PATCH] FileSource: GUI: use file source name from settings directly

---
 plugins/channeltx/filesource/filesourcegui.cpp | 11 ++++-------
 plugins/channeltx/filesource/filesourcegui.h   |  1 -
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/plugins/channeltx/filesource/filesourcegui.cpp b/plugins/channeltx/filesource/filesourcegui.cpp
index 00c6d7833..a54277213 100644
--- a/plugins/channeltx/filesource/filesourcegui.cpp
+++ b/plugins/channeltx/filesource/filesourcegui.cpp
@@ -81,7 +81,6 @@ bool FileSourceGUI::handleMessage(const Message& message)
     {
         const FileSource::MsgConfigureFileSource& cfg = (FileSource::MsgConfigureFileSource&) message;
         m_settings = cfg.getSettings();
-        m_fileName = m_settings.m_fileName;
         blockApplySettings(true);
         displaySettings();
         blockApplySettings(false);
@@ -188,7 +187,6 @@ FileSourceGUI::FileSourceGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Bas
 
     m_fileSource = (FileSource*) channelTx;
     m_fileSource->setMessageQueueToGUI(getInputMessageQueue());
-    m_fileName = m_settings.m_fileName;
 
     connect(&(m_deviceUISet->m_deviceAPI->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick()));
 
@@ -236,8 +234,7 @@ void FileSourceGUI::applySettings(bool force)
 
 void FileSourceGUI::configureFileName()
 {
-	qDebug() << "FileSourceGui::configureFileName: " << m_fileName.toStdString().c_str();
-    m_settings.m_fileName = m_fileName;
+	qDebug() << "FileSourceGui::configureFileName: " << m_settings.m_fileName.toStdString().c_str();
     applySettings();
 }
 
@@ -305,7 +302,7 @@ void FileSourceGUI::displaySettings()
     displayStreamIndex();
 
     blockApplySettings(true);
-    ui->fileNameText->setText(m_fileName);
+    ui->fileNameText->setText(m_settings.m_fileName);
     ui->gain->setValue(m_settings.m_gainDB);
     ui->gainText->setText(tr("%1 dB").arg(m_settings.m_gainDB));
     ui->interpolationFactor->setCurrentIndex(m_settings.m_log2Interp);
@@ -434,8 +431,8 @@ void FileSourceGUI::on_showFileDialog_clicked(bool checked)
 
 	if (fileName != "")
 	{
-		m_fileName = fileName;
-		ui->fileNameText->setText(m_fileName);
+		m_settings.m_fileName = fileName;
+		ui->fileNameText->setText(m_settings.m_fileName);
 		ui->crcLabel->setStyleSheet("QLabel { background:rgb(79,79,79); }");
 		configureFileName();
 	}
diff --git a/plugins/channeltx/filesource/filesourcegui.h b/plugins/channeltx/filesource/filesourcegui.h
index 99196d2ad..fd051200e 100644
--- a/plugins/channeltx/filesource/filesourcegui.h
+++ b/plugins/channeltx/filesource/filesourcegui.h
@@ -56,7 +56,6 @@ private:
     FileSourceSettings m_settings;
     int m_sampleRate;
     double m_shiftFrequencyFactor; //!< Channel frequency shift factor
-    QString m_fileName;
     int m_fileSampleRate;
     quint32 m_fileSampleSize;
     quint64 m_recordLengthMuSec;