From 59f713ba766fcd68c858a3603041976121e89e44 Mon Sep 17 00:00:00 2001
From: Steve Franke <s.j.franke@icloud.com>
Date: Tue, 17 Jul 2018 17:48:23 -0500
Subject: [PATCH] The change committed to decodedtext.cpp fixes a crash that
 occurred when processing certain isync=2 decodes. Is this the right fix?
 Other changes are minor code cleanups.

---
 decodedtext.cpp    | 2 +-
 lib/ft8/ft8b_2.f90 | 5 -----
 lib/ft8_decode.f90 | 4 ++--
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/decodedtext.cpp b/decodedtext.cpp
index 10d5a8529..265b8ffaf 100644
--- a/decodedtext.cpp
+++ b/decodedtext.cpp
@@ -22,7 +22,7 @@ DecodedText::DecodedText (QString const& the_string)
 {
   if (message_.length() >= 1)
     {
-      message_ = message_.left (21).remove (QRegularExpression {"[<>]"});
+      message_ = message_.left (36).remove (QRegularExpression {"[<>]"});
       int i1 = message_.indexOf ('\r');
       if (i1 > 0)
         {
diff --git a/lib/ft8/ft8b_2.f90 b/lib/ft8/ft8b_2.f90
index 3b8763eef..dbcb6ceee 100644
--- a/lib/ft8/ft8b_2.f90
+++ b/lib/ft8/ft8b_2.f90
@@ -321,12 +321,7 @@ subroutine ft8b_2(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,lapcqonly,  &
      write(c77,'(77i1)') message77
      read(c77(72:74),'(b3)') n3
      read(c77(75:77),'(b3)') i3
-!write(*,'(77i1)') message77
      call unpack77(c77,msg37)
-!TEST ONLY
-     call pack77(msg37,i3p,n3p,c77)
-! Should we test for consistency between i3,n3 from codeword and i3,n3 from unpack77?
-!write(*,*) i3,n3,i3p,n3p,msg37
      call genft8_174_91(msg37,i3,n3,msgsent37,msgbits,itone)
      if(lsubtract) call subtractft8(dd0,itone,f1,xdt) 
      xsig=0.0
diff --git a/lib/ft8_decode.f90 b/lib/ft8_decode.f90
index 86ff5554b..7206350d3 100644
--- a/lib/ft8_decode.f90
+++ b/lib/ft8_decode.f90
@@ -139,8 +139,8 @@ contains
            endif
 !           write(81,1004) nutc,ncand,icand,ipass,iaptype,iappass,        &
 !                nharderrors,dmin,hd,min(sync,999.0),nint(xsnr),          &
-!                xdt,nint(f1),msg37,isync,nbadcrc
-!1004          format(i6.6,2i4,3i2,i3,3f6.1,i4,f6.2,i5,2x,a37,i4,i4)
+!                xdt,nint(f1),msg37,isync
+!1004          format(i6.6,2i4,3i2,i3,3f6.1,i4,f6.2,i5,2x,a37,i4)
 !           flush(81)
            if(.not.ldupe .and. associated(this%callback)) then
 !              print*,'nharderrors:',nharderrors