From fe447f9007c317052aa5895935743fb67c0a9c9d Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Fri, 14 Jul 2017 17:05:14 +0000
Subject: [PATCH] W9MDB patch to protect Tx5 from being over-written during
 AutoSeq QSO.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7880 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 mainwindow.cpp | 7 +++++--
 mainwindow.h   | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index b209ae849..953dc0c98 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -2784,7 +2784,7 @@ void MainWindow::readFromStdout()                             //readFromStdout
 void MainWindow::FT8_AutoSeq(QString message)
 {
   int i1=message.indexOf(m_baseCall);
-  int i2=message.indexOf(m_hisCall);
+  int i2=message.indexOf(Radio::base_callsign(m_hisCall));
   if(i1>10 and i2>i1+3) {
     if ((message.indexOf (" 73") < 0 || m_ntx != 6)) {
       if(ui->cbAutoSeq->isChecked() and !m_sentFirst73) processMessage (message,43,false);
@@ -3899,7 +3899,10 @@ void MainWindow::genStdMsgs(QString rpt)
     msgtype(t, ui->tx4);
     t=t0 + "73";
     if((m_mode=="JT4" or m_mode=="QRA64") and m_bShMsgs) t="@1750  (73)";
-    msgtype(t, ui->tx5->lineEdit ());
+    if (hisBase != m_lastCallsign) { // only update tx5 when callsign changes
+      msgtype(t, ui->tx5->lineEdit ());
+      m_lastCallsign = hisBase;
+    }
    }
 
   if(m_config.my_callsign () != m_baseCall) {
diff --git a/mainwindow.h b/mainwindow.h
index e0546871d..50a457e12 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -334,6 +334,7 @@ private:
   Transceiver::TransceiverState m_rigState;
   Frequency  m_lastDialFreq;
   QString m_lastBand;
+  QString m_lastCallsign;
   Frequency  m_dialFreqRxWSPR;  // best guess at WSPR QRG
 
   Detector * m_detector;