From 78dd580a9ebbe305378bc6c4f25ada8a2184e110 Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Tue, 18 Sep 2018 13:57:44 -0400
Subject: [PATCH] Fix the bug that colored all "bare CQ" messages (no grid) as
 new DXCCs.

---
 displaytext.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/displaytext.cpp b/displaytext.cpp
index 394fe658d..b17421a74 100644
--- a/displaytext.cpp
+++ b/displaytext.cpp
@@ -178,13 +178,12 @@ QString DisplayText::appendWorkedB4(QString message, QString const& callsign, QS
   if(call.length()<3) return message;
   if(!call.contains(QRegExp("[0-9]|[A-Z]"))) return message;
 
+  logBook.match(/*in*/call,grid,/*out*/countryName,callWorkedBefore,countryWorkedBefore,gridB4);
+  logBook.match(/*in*/call,grid,/*out*/countryName,callB4onBand,countryB4onBand,gridB4onBand,
+                /*in*/ currentBand);
   if(grid=="") {
     gridB4=true;
     gridB4onBand=true;
-  } else {
-    logBook.match(/*in*/call,grid,/*out*/countryName,callWorkedBefore,countryWorkedBefore,gridB4);
-    logBook.match(/*in*/call,grid,/*out*/countryName,callB4onBand,countryB4onBand,gridB4onBand,
-                  /*in*/ currentBand);
   }
 
   message = message.trimmed ();