From da02f7055fe481b4891fe7d271141255f53df2af Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Fri, 19 Oct 2018 21:50:09 -0400
Subject: [PATCH] Ont more try at getting the autogenerated messages right for
 nonstandard calls.

---
 mainwindow.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index b9f7b4f40..938226752 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -4779,9 +4779,14 @@ void MainWindow::genStdMsgs(QString rpt, bool unconditional)
       rst.sprintf("5%1d9 ",nn);
       rs=rst.mid(0,2);
       t=t0;
-      if(b77 and !bMyCall) t=t0b;
-      if(b77 and !bHisCall) t=t0a;
-      if(b77 and (t!=t0)) msgtype(t, ui->tx1);
+      if(b77 and !bMyCall) {
+        t=t0b;
+        msgtype(t0a, ui->tx1);
+      }
+      if(b77 and !bHisCall) {
+        t=t0a;
+        msgtype(t0a, ui->tx1);
+      }
       if(m_config.bNA_VHF_Contest()) sent=my_grid;
       if(m_config.bFieldDay()) sent=m_config.FieldDayExchange();
       if(m_config.bRTTYroundup()) {