From 966d774f09b56623136e06615692d6d3dd933cb9 Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Wed, 14 Sep 2016 16:19:21 +0000
Subject: [PATCH] More cleanup of spurious identifications of DXCC entities
 fron non-callsigns.

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

diff --git a/displaytext.cpp b/displaytext.cpp
index dc36d4627..f0eb07e15 100644
--- a/displaytext.cpp
+++ b/displaytext.cpp
@@ -78,7 +78,6 @@ void DisplayText::_appendDXCCWorkedB4(DecodedText& t1, QString& bg,
                                       QColor color_NewCall)
 {
     QString call = t1.CQersCall ();
-
     QString countryName;
     bool callWorkedBefore;
     bool countryWorkedBefore;
@@ -89,6 +88,8 @@ void DisplayText::_appendDXCCWorkedB4(DecodedText& t1, QString& bg,
       i0=call.indexOf(" ");
       call=call.mid(0,i0);
     }
+    if(call.length()<3) return;
+    if(!call.contains(QRegExp("[0-9]")) or !call.contains(QRegExp("[A-Z]"))) return;
 
     logBook.match(/*in*/call,/*out*/countryName,callWorkedBefore,countryWorkedBefore);
     int charsAvail = 48;
@@ -169,7 +170,6 @@ void DisplayText::displayDecodedText(DecodedText decodedText, QString myCall,
           or decodedText.indexOf (" " + myCall + ">") >= 0)) {
       bg=color_MyCall.name();
     }
-
     // if enabled add the DXCC entity and B4 status to the end of the preformated text line t1
     if (displayDXCCEntity && CQcall)
         _appendDXCCWorkedB4(/*mod*/decodedText,bg,logBook,color_CQ,