From 39bb190fd255af7dfa4148f95ce634d30a1dc6bd Mon Sep 17 00:00:00 2001
From: Andreas <6977712+AndreasK79@users.noreply.github.com>
Date: Sat, 4 Nov 2023 18:31:39 +0100
Subject: [PATCH] Fix county format in ADIF export

---
 application/libraries/AdifHelper.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/application/libraries/AdifHelper.php b/application/libraries/AdifHelper.php
index a639896c..d167077a 100644
--- a/application/libraries/AdifHelper.php
+++ b/application/libraries/AdifHelper.php
@@ -198,7 +198,13 @@ class AdifHelper {
 
         $line .= $this->getAdifFieldLine("MY_ITU_ZONE", $qso->station_itu);
 
-        $line .= $this->getAdifFieldLine("MY_CNTY", $qso->station_cnty);
+		if($qso->state) {
+			$county = trim($qso->state) . "," . trim($qso->station_cnty);
+		} else {
+			$county = trim($qso->station_cnty);
+		}
+
+        $line .= $this->getAdifFieldLine("MY_CNTY", $county);
 
         $line .= $this->getAdifFieldLine("MY_SIG", $qso->station_sig);