From bc8e860b59a317d583b538d0d4d0c2d6d14c56b7 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Wed, 28 Mar 2018 15:46:48 +0000 Subject: [PATCH] Fix a bug in saving the correct "Rpt Rcvd" when someone tailends a QSO by sending Tx2. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8588 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- mainwindow.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index 2d84e2a5e..57de7266b 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -3011,10 +3011,15 @@ void MainWindow::readFromStdout() //readFromStdout m_mode=="JT9") auto_sequence (decodedtext, 25, 50); postDecode (true, decodedtext.string ()); - // find and extract any report for myCall +// find and extract any report for myCall, but save in m_rptRcvd only if it's from DXcall + QString rpt; bool stdMsg = decodedtext.report(m_baseCall, - Radio::base_callsign(ui->dxCallEntry->text()), m_rptRcvd); - // extract details and send to PSKreporter + Radio::base_callsign(ui->dxCallEntry->text()), rpt); + QString deCall; + QString grid; + decodedtext.deCallAndGrid(/*out*/deCall,grid); + if(Radio::base_callsign(ui->dxCallEntry->text())==deCall) m_rptRcvd=rpt; +// extract details and send to PSKreporter int nsec=QDateTime::currentMSecsSinceEpoch()/1000-m_secBandChanged; bool okToPost=(nsec>(4*m_TRperiod)/5); if (stdMsg && okToPost) pskPost(decodedtext);