From 814f602f68a211562cd6976692bf24fe26109905 Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Fri, 9 Sep 2016 15:33:21 +0000
Subject: [PATCH] Fix the DXCC entity logic so that "CQ CT K1ABC" isn't flagged
 as "Portugal".

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7068 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 displaytext.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/displaytext.cpp b/displaytext.cpp
index 1e7bea6e4..742404630 100644
--- a/displaytext.cpp
+++ b/displaytext.cpp
@@ -82,8 +82,15 @@ void DisplayText::_appendDXCCWorkedB4(DecodedText& t1, QString& bg,
     QString countryName;
     bool callWorkedBefore;
     bool countryWorkedBefore;
-    logBook.match(/*in*/call,/*out*/countryName,callWorkedBefore,countryWorkedBefore);
 
+    if(call.length()==2) {
+      int i0=t1.indexOf("CQ "+call);
+      call=t1.mid(i0+6,-1);
+      i0=call.indexOf(" ");
+      call=call.mid(0,i0);
+    }
+
+    logBook.match(/*in*/call,/*out*/countryName,callWorkedBefore,countryWorkedBefore);
     int charsAvail = 48;
 
     // the decoder (seems) to always generate 41 chars. For a normal CQ call, the last five are spaces