From 3361e9372fa51273642ef2e3ba74a8c3eb82b3be Mon Sep 17 00:00:00 2001
From: Ladislav Foldyna <foldyna@gmail.com>
Date: Wed, 28 Aug 2024 10:36:08 +0200
Subject: [PATCH] DX Cluster - Loging Callsign is always the base Callsign

DX Cluster rejects a loging callsign when the callsign contains suffix
---
 Changelog       | 1 +
 ui/DxWidget.cpp | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Changelog b/Changelog
index 4e579ae1..5f56bed1 100644
--- a/Changelog
+++ b/Changelog
@@ -14,6 +14,7 @@ TBC - 0.38.0
 - [CHANGED] - File Open dialogs are not a native dialog under Linux (issue #427)
 - [CHANGED] - Profiles transferred to DB
 - [CHANGED] - LOV last_dates transferred to DB
+- [CHANGED] - DX Cluster - Login Callsign is always the base Callsign
 - [REMOVED] - Setting DXCC Date
 - Fix for MacOS Layout Geometry Restore (@aa5sh)
 - Fixed TQSL does not block GUI thread
diff --git a/ui/DxWidget.cpp b/ui/DxWidget.cpp
index 2ad4969a..2710ad90 100644
--- a/ui/DxWidget.cpp
+++ b/ui/DxWidget.cpp
@@ -30,6 +30,7 @@
 #include "data/BandPlan.h"
 #include "core/DxServerString.h"
 #include "rig/macros.h"
+#include "core/Callsign.h"
 
 #define CONSOLE_VIEW 4
 #define NUM_OF_RECONNECT_ATTEMPTS 3
@@ -501,8 +502,10 @@ void DxWidget::connectCluster()
 {
     FCT_IDENTIFICATION;
 
+    const Callsign connectCallsign(StationProfilesManager::instance()->getCurProfile1().callsign);
     connectedServerString = new DxServerString(ui->serverSelect->currentText(),
-                                               StationProfilesManager::instance()->getCurProfile1().callsign.toLower());
+                                               connectCallsign.isValid() ? connectCallsign.getBase().toLower()
+                                                                         : QString());
 
     if ( !connectedServerString )
     {