diff --git a/lib/msk40decodeframe.f90 b/lib/msk40decodeframe.f90 index 557d7f956..e964517f6 100644 --- a/lib/msk40decodeframe.f90 +++ b/lib/msk40decodeframe.f90 @@ -57,7 +57,7 @@ subroutine msk40decodeframe(c,mycall,hiscall,xsnr,bswl,nhasharray, & if(mycall.ne.mycall0 .or. hiscall.ne.hiscall0) then hashmsg=trim(mycall)//' '//trim(hiscall) - if( hashmsg .ne. ' ' ) then + if( hashmsg .ne. ' ' .and. hiscall .ne. '' ) then ! protect against blank mycall/hiscall call fmtmsg(hashmsg,iz) call hash(hashmsg,22,ihash) ihash=iand(ihash,4095) @@ -133,6 +133,7 @@ subroutine msk40decodeframe(c,mycall,hiscall,xsnr,bswl,nhasharray, & enddo nrxrpt=iand(imsg,15) nrxhash=(imsg-nrxrpt)/16 + if(nhammd.le.4 .and. cord .lt. 0.65 .and. nrxhash.eq.ihash) then !write(*,*) 'decodeframe 1',nhammd,cord,nrxhash,nrxrpt,ihash,xsnr,sigma nsuccess=1 diff --git a/lib/update_hasharray.f90 b/lib/update_hasharray.f90 index 0889a8807..0f9c872e8 100644 --- a/lib/update_hasharray.f90 +++ b/lib/update_hasharray.f90 @@ -7,7 +7,7 @@ subroutine update_hasharray(recent_calls,nrecent,nhasharray) nhasharray=-1 do i=1,nrecent do j=i+1,nrecent - if( recent_calls(i)(1:2) .ne. ' ' .and. recent_calls(j)(1:2) .ne. ' ' ) then + if( recent_calls(i)(1:1) .ne. ' ' .and. recent_calls(j)(1:1) .ne. ' ' ) then hashmsg=trim(recent_calls(i))//' '//trim(recent_calls(j)) call fmtmsg(hashmsg,iz) call hash(hashmsg,22,ihash)