From e6b6a3ab5b40d6c5cf0b3c9b1464ebf18758861b Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Wed, 13 May 2020 11:54:25 -0400
Subject: [PATCH] Bug fix for compound callsigns used with EU VHF Contest
 messages.

---
 lib/77bit/packjt77.f90 | 1 +
 widgets/mainwindow.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/77bit/packjt77.f90 b/lib/77bit/packjt77.f90
index 4d51e421a..6be8a0841 100644
--- a/lib/77bit/packjt77.f90
+++ b/lib/77bit/packjt77.f90
@@ -534,6 +534,7 @@ subroutine unpack77(c77,nrx,msg,unpk77_success)
      read(c77,1060) n12,n22,ir,irpt,iserial,igrid6
 1060 format(b12,b22,b1,b3,b11,b25)
      call hash12(n12,call_1)
+     if(n12.eq.hashmy12) call_1='<'//trim(mycall13)//'>'
      call hash22(n22,call_2)
      nrs=52+irpt
      write(cexch,1022) nrs,iserial
diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp
index ed5a0cf0e..7399fbe32 100644
--- a/widgets/mainwindow.cpp
+++ b/widgets/mainwindow.cpp
@@ -5134,7 +5134,7 @@ void MainWindow::genStdMsgs(QString rpt, bool unconditional)
       }
       if(SpecOp::EU_VHF==m_config.special_op_id()) {
         QString a;
-        t="<" + t0.split(" ").at(0) + "> <" + t0.split(" ").at(1) + "> ";
+        t="<" + t0s.split(" ").at(0) + "> <" + t0s.split(" ").at(1) + "> ";
         a = a.asprintf("%4.4d ",ui->sbSerialNumber->value());
         sent=rs + a + m_config.my_grid();
       }