From 89607955ba239a2d64fb9144e095b0265c190a46 Mon Sep 17 00:00:00 2001
From: Bill Somerville <g4wjs@classdesign.com>
Date: Mon, 25 Sep 2017 23:38:27 +0000
Subject: [PATCH] Fix a regression handling compound calls in 73 messages

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

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 5cfb23846..b141d8665 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -4027,27 +4027,24 @@ void MainWindow::processMessage(DecodedText const& message, bool ctrl, bool alt)
     m_QSOText = s2;
   }
 
-  if (!is_73 && Radio::is_callsign (hiscall))
-    {
-      if (base_call != qso_partner_base_call || base_call != hiscall)
-        {
-          if (qso_partner_base_call != base_call) {
-            // clear the DX grid if the base call of his call is different
-            // from the current DX call
-            ui->dxGridEntry->clear ();
-          }
-          // his base call different or his call more qualified
-          // i.e. compound version of same base call
-          ui->dxCallEntry->setText (hiscall);
-        }
-      if (hisgrid.contains (grid_regexp)) {
-        if(ui->dxGridEntry->text().mid(0,4) != hisgrid) ui->dxGridEntry->setText(hisgrid);
-      }
-      if (!ui->dxGridEntry->text ().size ())
-        lookup();
-      m_hisGrid = ui->dxGridEntry->text();
+  if (Radio::is_callsign (hiscall)
+      && (base_call != qso_partner_base_call || base_call != hiscall)) {
+    if (qso_partner_base_call != base_call) {
+      // clear the DX grid if the base call of his call is different
+      // from the current DX call
+      ui->dxGridEntry->clear ();
     }
-  
+    // his base call different or his call more qualified
+    // i.e. compound version of same base call
+    ui->dxCallEntry->setText (hiscall);
+  }
+  if (hisgrid.contains (grid_regexp)) {
+    if(ui->dxGridEntry->text().mid(0,4) != hisgrid) ui->dxGridEntry->setText(hisgrid);
+   }
+  if (!ui->dxGridEntry->text ().size ())
+    lookup();
+  m_hisGrid = ui->dxGridEntry->text();
+
   QString rpt = message.report();
   int n=rpt.toInt();
   if(m_mode=="MSK144" and m_bShMsgs) {