Merge branch 'develop' into superfox

This commit is contained in:
Joe Taylor 2024-01-31 10:15:25 -05:00
commit d100c4e9e0
2 changed files with 2 additions and 0 deletions

View File

@ -740,6 +740,7 @@ void MainWindow::decoderFinished()
{
m_startAnother=m_loopall;
decodes_.nQDecoderDone=1;
decodes_.kHzRequested=0;
if(m_diskData) decodes_.nQDecoderDone=2;
mem_qmap.lock();
decodes_.nWDecoderBusy=ipc_wsjtx[3]; //Prevent overwriting values

View File

@ -4266,6 +4266,7 @@ void MainWindow::readFromStdout() //readFromStdout
}
if(m_mode=="Q65" and !bAvgMsg and !decodedtext.string().contains(m_baseCall)) bDisplayRight=false;
if((m_mode=="JT4" or m_mode=="Q65" or m_mode=="JT65") and decodedtext.string().contains(m_baseCall) && ui->actionInclude_averaging->isVisible() && !ui->actionInclude_averaging->isChecked()) bDisplayRight=true;
if(m_mode=="FT8" and SpecOp::HOUND==m_specOp && decodedtext0.string().replace("<","").replace(">","").contains(" " + m_baseCall + " ")) bDisplayRight=true;
if (bDisplayRight) {
// This msg is within 10 hertz of our tuned frequency, or a JT4 or JT65 avg,