Merge branch 'bugfix-526_2' into testing_0.42

foldynl · Feb 2, 2025 · 052604f · 052604f
2 parents 07b6f69 + 3ddc96c
commit 052604f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/ui/NewContactWidget.cpp b/ui/NewContactWidget.cpp
@@ -797,8 +797,10 @@ void NewContactWidget::refreshRigProfileCombo()
     if ( isManualEnterMode )
         return;
 
-    ui->freqRXEdit->setValue(realRigFreq + RigProfilesManager::instance()->getProfile(currentText).ritOffset);
-    ui->freqTXEdit->setValue(realRigFreq + RigProfilesManager::instance()->getProfile(currentText).xitOffset);
+    __changeFrequency(VFO1, realRigFreq,
+                      realRigFreq + RigProfilesManager::instance()->getProfile(currentText).ritOffset,
+                      realRigFreq + RigProfilesManager::instance()->getProfile(currentText).xitOffset);
+
     uiDynamic->powerEdit->setValue(RigProfilesManager::instance()->getProfile(currentText).defaultPWR);
 }
 

diff --git a/ui/RigWidget.cpp b/ui/RigWidget.cpp
@@ -44,8 +44,6 @@ RigWidget::RigWidget(QWidget *parent) :
     ui->modeComboBox->setModel(modesModel);
 
     refreshRigProfileCombo();
-    refreshBandCombo();
-    refreshModeCombo();
 
     QTimer *onAirTimer = new QTimer(this);
     connect(onAirTimer, &QTimer::timeout, this, &RigWidget::sendOnAirState);
@@ -258,6 +256,8 @@ void RigWidget::refreshRigProfileCombo()
     ui->pttLabel->setHidden(!RigProfilesManager::instance()->getCurProfile1().getPTTInfo);
 
     ui->rigProfilCombo->blockSignals(false);
+    refreshBandCombo();
+    refreshModeCombo();
 }
 
 void RigWidget::refreshBandCombo()
@@ -294,8 +294,6 @@ void RigWidget::reloadSettings()
     FCT_IDENTIFICATION;
 
     refreshRigProfileCombo();
-    refreshBandCombo();
-    refreshModeCombo();
 }
 
 void RigWidget::rigConnected()
@@ -304,21 +302,33 @@ void RigWidget::rigConnected()
 
     ui->rigProfilCombo->setStyleSheet("QComboBox {color: green}");
     rigOnline = true;
+    ui->bandComboBox->blockSignals(true);
+    ui->modeComboBox->blockSignals(true);
     ui->bandComboBox->setEnabled(true);
     ui->modeComboBox->setEnabled(true);
+    ui->modeComboBox->blockSignals(false);
+    ui->bandComboBox->blockSignals(false);
+
     refreshModeCombo();
 }
 
 void RigWidget::rigDisconnected()
 {
     FCT_IDENTIFICATION;
 
+    ui->bandComboBox->blockSignals(true);
+    ui->modeComboBox->blockSignals(true);
+
     saveLastSeenFreq();
     ui->rigProfilCombo->setStyleSheet("QComboBox {color: red}");
     rigOnline = false;
     resetRigInfo();
+
     ui->bandComboBox->setEnabled(false);
     ui->modeComboBox->setEnabled(false);
+
+    ui->modeComboBox->blockSignals(false);
+    ui->bandComboBox->blockSignals(false);
 }
 
 void RigWidget::bandUp()