From a258c1fe13ea80a87a641199b34d65b7163d30ee Mon Sep 17 00:00:00 2001
From: PianetaRadio <78976006+PianetaRadio@users.noreply.github.com>
Date: Thu, 7 Mar 2024 23:29:02 +0100
Subject: [PATCH] Add files via upload

#44
---
 dialogconfig.cpp | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/dialogconfig.cpp b/dialogconfig.cpp
index 2cdddf6..cb605ee 100644
--- a/dialogconfig.cpp
+++ b/dialogconfig.cpp
@@ -216,11 +216,12 @@ void DialogConfig::on_buttonBox_accepted()
         {
             rigCom.netRigctl = false;
             rigCom.rigPort = ui->comboBox_comPort->currentText();
-            rigCom.serialSpeed = ui->comboBox_serialSpeed->currentText().toInt();
-            rigCom.civAddr = ui->lineEdit_civAddr->text().toInt(&civAddrConv,16);
-            setRigSerialConfigFromDialog();
+            //rigCom.serialSpeed = ui->comboBox_serialSpeed->currentText().toInt();
+            //rigCom.civAddr = ui->lineEdit_civAddr->text().toInt(&civAddrConv,16);
+            //setRigSerialConfigFromDialog();
 
-            if (rigCom.rigPort == "" && rigCom.rigModel != 1 && rigCom.rigModel != 6)
+            //if (rigCom.rigPort == "" && rigCom.rigModel != 1 && rigCom.rigModel != 6)
+            if (rigCom.rigPort == "")
             {
                 QMessageBox msgBox; //Show error MessageBox
                 msgBox.setWindowTitle("Warning");
@@ -230,6 +231,10 @@ void DialogConfig::on_buttonBox_accepted()
                 msgBox.exec();
             }
         }
+
+        rigCom.serialSpeed = ui->comboBox_serialSpeed->currentText().toInt();
+        rigCom.civAddr = ui->lineEdit_civAddr->text().toInt(&civAddrConv,16);
+        setRigSerialConfigFromDialog();
     }
 
     rigCom.rigRefresh = ui->spinBox_RefreshRate->value();
@@ -286,11 +291,11 @@ void DialogConfig::on_checkBox_netRigctl_toggled(bool checked)
 {
     if (checked)    //TCP port
     {
-        ui->comboBox_comPort->setCurrentText("");   //clear COM port
+        //ui->comboBox_comPort->setCurrentText("");   //clear COM port
     }
     else    //COM port
     {
-        ui->lineEdit_ip->setText("");   //clear IP address
+        //ui->lineEdit_ip->setText("");   //clear IP address
     }
 }