From 173737e1d903d4e6e9402b52227cad6e16a54d3a Mon Sep 17 00:00:00 2001
From: Steve Franke <s.j.franke@icloud.com>
Date: Sat, 6 Oct 2018 11:14:57 -0500
Subject: [PATCH] Fix Tx1 problem with extended callsigns in MSK144. Make sure
 that mycall is in the hashtable.

---
 lib/mskrtd.f90 | 8 +++++++-
 mainwindow.cpp | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/mskrtd.f90 b/lib/mskrtd.f90
index abb5f766d..8148a8e86 100644
--- a/lib/mskrtd.f90
+++ b/lib/mskrtd.f90
@@ -18,6 +18,7 @@ subroutine mskrtd(id2,nutc0,tsec,ntol,nrxfreq,ndepth,mycall,mygrid,hiscall,   &
   character*37 msglast,msglastswl    !Used for dupechecking
   character*80 line                  !Formatted line with UTC dB T Freq Msg
   character*12 mycall,hiscall
+  character*13 mycall13
   character*6 mygrid
   character*37 recent_shmsgs(NSHMEM)
   character*512 datadir
@@ -54,7 +55,7 @@ subroutine mskrtd(id2,nutc0,tsec,ntol,nrxfreq,ndepth,mycall,mygrid,hiscall,   &
        1,1,1,1,1,1,1,0/
   data xmc/2.0,4.5,2.5,3.5/     !Used to set time at center of averaging mask
   save first,tsec0,nutc00,pnoise,cdat,msglast,msglastswl,     &
-       nsnrlast,nsnrlastswl,nhasharray,recent_shmsgs
+       nsnrlast,nsnrlastswl,nhasharray,recent_shmsgs,mycall13
 
   if(first) then
      tsec0=tsec
@@ -70,11 +71,16 @@ subroutine mskrtd(id2,nutc0,tsec,ntol,nrxfreq,ndepth,mycall,mygrid,hiscall,   &
      msglastswl='                                     '
      nsnrlast=-99
      nsnrlastswl=-99
+     mycall13=mycall//" "
+     call save_hash_call(mycall13,n10,n12,n22) ! Make sure that my callsign is in hashtable
      first=.false.
   endif
 
   fc=nrxfreq
 
+! Reset if mycall changes
+  if(mycall13(1:12).ne.mycall) first=.true.
+
 ! Dupe checking setup 
   if(nutc00.ne.nutc0 .or. tsec.lt.tsec0) then ! reset dupe checker
     msglast='                                     '
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 765f1db61..9d81a2846 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -4817,7 +4817,7 @@ void MainWindow::genStdMsgs(QString rpt, bool unconditional)
     }
   }
 
-  if(m_config.bGenerate77()) return;
+  if(m_config.bGenerate77() or "MSK144" == m_mode) return;
 
   if (is_compound) {
     if (is_type_one) {