From 465416ee19e24830ae771562c2e459f6c8dc52ae Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Fri, 3 Nov 2017 20:13:54 +0100
Subject: [PATCH] SSB channels: fix the fixes (2)

---
 plugins/channelrx/demodssb/ssbdemodgui.cpp | 10 +++++++++-
 plugins/channeltx/modssb/ssbmodgui.cpp     | 21 +++++++++++++++------
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/plugins/channelrx/demodssb/ssbdemodgui.cpp b/plugins/channelrx/demodssb/ssbdemodgui.cpp
index 061968839..95cb97b0b 100644
--- a/plugins/channelrx/demodssb/ssbdemodgui.cpp
+++ b/plugins/channelrx/demodssb/ssbdemodgui.cpp
@@ -260,7 +260,7 @@ SSBDemodGUI::SSBDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, QWidget
 	ui->spectrumGUI->setBuddies(m_spectrumVis->getInputMessageQueue(), m_spectrumVis, ui->glSpectrum);
 
 	displaySettings();
-	applyBandwidths(true);
+	applyBandwidths(true); // does applySettings(true)
 }
 
 SSBDemodGUI::~SSBDemodGUI()
@@ -303,6 +303,14 @@ void SSBDemodGUI::applyBandwidths(bool force)
     int lw = ui->lowCut->value();
     int bwMax = 480/(1<<spanLog2);
 
+    qDebug() << "SSBDemodGUI::applyBandwidths:"
+            << " dsb: " << dsb
+            << " spanLog2: " << spanLog2
+            << " m_spectrumRate: " << m_spectrumRate
+            << " bw: " << bw
+            << " lw: " << lw
+            << " bwMax: " << bwMax;
+
     bw = bw < -bwMax ? -bwMax : bw > bwMax ? bwMax : bw;
 
     if (bw < 0) {
diff --git a/plugins/channeltx/modssb/ssbmodgui.cpp b/plugins/channeltx/modssb/ssbmodgui.cpp
index 2f02d47e8..49f827d77 100644
--- a/plugins/channeltx/modssb/ssbmodgui.cpp
+++ b/plugins/channeltx/modssb/ssbmodgui.cpp
@@ -80,15 +80,16 @@ bool SSBModGUI::deserialize(const QByteArray& data)
 {
     if(m_settings.deserialize(data))
     {
+        qDebug("SSBModGUI::deserialize");
         displaySettings();
-        applySettings(true); // will have true
+        applyBandwidths(true); // does applySettings(true)
         return true;
     }
     else
     {
         m_settings.resetToDefaults();
         displaySettings();
-        applySettings(true); // will have true
+        applyBandwidths(true); // does applySettings(true)
         return false;
     }
 }
@@ -415,11 +416,11 @@ SSBModGUI::SSBModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, QWidget* pa
     m_settings.setSpectrumGUI(ui->spectrumGUI);
     m_settings.setCWKeyerGUI(ui->cwKeyerGUI);
 
-    displaySettings();
-    applyBandwidths(true); // does applySettings(true)
-
 	connect(getInputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleSourceMessages()));
 	connect(m_ssbMod, SIGNAL(levelChanged(qreal, qreal, int)), ui->volumeMeter, SLOT(levelChanged(qreal, qreal, int)));
+
+    displaySettings();
+    applyBandwidths(true); // does applySettings(true)
 }
 
 SSBModGUI::~SSBModGUI()
@@ -459,6 +460,14 @@ void SSBModGUI::applyBandwidths(bool force)
     int lw = ui->lowCut->value();
     int bwMax = 480/(1<<spanLog2);
 
+    qDebug() << "SSBModGUI::applyBandwidths:"
+            << " dsb: " << dsb
+            << " spanLog2: " << spanLog2
+            << " m_spectrumRate: " << m_spectrumRate
+            << " bw: " << bw
+            << " lw: " << lw
+            << " bwMax: " << bwMax;
+
     bw = bw < -bwMax ? -bwMax : bw > bwMax ? bwMax : bw;
 
     if (bw < 0) {
@@ -530,7 +539,7 @@ void SSBModGUI::applyBandwidths(bool force)
 
 void SSBModGUI::displaySettings()
 {
-    bool applySettingsWereBlocked = blockApplySettings(true);
+   bool applySettingsWereBlocked = blockApplySettings(true);
 
     m_channelMarker.blockSignals(true);