From b6cf0fcfc4298e83c028e2e1ca5da5348e1df4f5 Mon Sep 17 00:00:00 2001
From: Phil Taylor <phil@m0vse.uk>
Date: Tue, 8 Jun 2021 17:51:10 +0100
Subject: [PATCH] Detect radio baudrate in server mode

---
 wfmain.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/wfmain.cpp b/wfmain.cpp
index a20bf11..5b6d5a6 100644
--- a/wfmain.cpp
+++ b/wfmain.cpp
@@ -1053,6 +1053,7 @@ void wfmain::setDefPrefs()
     udpDefPrefs.username = QString("");
     udpDefPrefs.password = QString("");
     udpDefPrefs.clientName = QHostInfo::localHostName();
+
 }
 
 void wfmain::loadSettings()
@@ -1129,11 +1130,15 @@ void wfmain::loadSettings()
     }
 
     prefs.serialPortBaud = (quint32) settings->value("SerialPortBaud", defPrefs.serialPortBaud).toInt();
-
     ui->baudRateCombo->blockSignals(true);
     ui->baudRateCombo->setCurrentIndex( ui->baudRateCombo->findData(prefs.serialPortBaud) );
     ui->baudRateCombo->blockSignals(false);
 
+    if (prefs.serialPortBaud > 0)
+    {
+        serverConfig.baudRate = prefs.serialPortBaud;
+    }
+
     prefs.virtualSerialPort = settings->value("VirtualSerialPort", defPrefs.virtualSerialPort).toString();
     int vspIndex = ui->vspCombo->findText(prefs.virtualSerialPort);
     if (vspIndex != -1) {
@@ -1282,7 +1287,6 @@ void wfmain::loadSettings()
     settings->endGroup();
 
     settings->beginGroup("Server");
-
     serverConfig.enabled = settings->value("ServerEnabled", false).toBool();
     serverConfig.controlPort = settings->value("ServerControlPort", 50001).toInt();
     serverConfig.civPort = settings->value("ServerCivPort", 50002).toInt();
@@ -4578,6 +4582,7 @@ void wfmain::on_baudRateCombo_activated(int index)
     if(ok)
     {
         prefs.serialPortBaud = baud;
+        serverConfig.baudRate = baud;
         showStatusBarText(QString("Changed baud rate to %1 bps. Press Save Settings to retain.").arg(baud));
     }
     (void)index;