From d9838cf6165791babea087b5e3ee2622678fce42 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Fri, 27 Jul 2018 16:50:58 -0400 Subject: [PATCH] Make message like "CQ YW18FIFA" acceptable. --- mainwindow.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index 5fa9c2352..8b9a071b7 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -3058,7 +3058,6 @@ void MainWindow::auto_sequence (DecodedText const& message, unsigned start_toler auto is_73 = message_words.filter (QRegularExpression {"^(73|RR73)$"}).size (); bool is_OK=false; if(m_mode=="MSK144" and message.string().indexOf(ui->dxCallEntry->text()+" R ")>0) is_OK=true; - if (message_words.size () > 2 && (message.isStandardMessage () || (is_73 or is_OK))) { auto df = message.frequencyOffset (); auto within_tolerance = (qAbs (ui->RxFreqSpinBox->value () - df) <= int (start_tolerance) @@ -3073,11 +3072,14 @@ void MainWindow::auto_sequence (DecodedText const& message, unsigned start_toler || message_words.contains ("DE"))) || !message.isStandardMessage ()); // free text 73/RR73 QString w2=message_words.at(2); - QString w34=message_words.at(3); - int nrpt=w2.toInt(); - if(w2=="R") { - nrpt=w34.toInt(); - w34=message_words.at(4); + int nrpt=0; + if(message_words.size()>3) { + QString w34=message_words.at(3); + nrpt=w2.toInt(); + if(w2=="R") { + nrpt=w34.toInt(); + w34=message_words.at(4); + } } bool bEUvhf=(nrpt>=520001 and nrpt<=594000); if (m_auto