From 57086026f09d1e968d51c9c853ffe7485a84bfcb Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Mon, 17 Jul 2017 15:47:08 +0000 Subject: [PATCH] Merged from trunk: ------------------------------------------------------------------------ r7921 | bsomervi | 2017-07-17 16:46:01 +0100 (Mon, 17 Jul 2017) | 3 lines Fix QRA64 and JT4 single tone short message texts in Tx5 Thanks to Mike, W9MDB, for this contribution. ------------------------------------------------------------------------ git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx-1.8@7922 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- mainwindow.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index 2e5db4adc..7cb9e7923 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -3899,8 +3899,12 @@ void MainWindow::genStdMsgs(QString rpt) if((m_mode=="JT4" or m_mode=="QRA64") and m_bShMsgs) t="@1500 (RRR)"; msgtype(t, ui->tx4); t=t0 + "73"; - if((m_mode=="JT4" or m_mode=="QRA64") and m_bShMsgs) t="@1750 (73)"; - if (hisBase != m_lastCallsign) { // only update tx5 when callsign changes + if(m_mode=="JT4" or m_mode=="QRA64") { + if (m_bShMsgs) t="@1750 (73)"; + msgtype(t, ui->tx5->lineEdit ()); + } + else if (hisBase != m_lastCallsign) { // only update tx5 when callsign changes + msgtype(t, ui->tx5->lineEdit ()); m_lastCallsign = hisBase; }