From b68c544ef7387c9c1659e1a6955db8d3accf37f9 Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Mon, 27 Dec 2021 12:26:22 -0500
Subject: [PATCH] Fix the nonstandard callsign bug in v2.5.3.

---
 widgets/mainwindow.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp
index b6cb6542b..113180480 100644
--- a/widgets/mainwindow.cpp
+++ b/widgets/mainwindow.cpp
@@ -3643,9 +3643,8 @@ void MainWindow::auto_sequence (DecodedText const& message, unsigned start_toler
 {
   auto const& message_words = message.messageWords ();
   auto is_73 = message_words.filter (QRegularExpression {"^(73|RR73)$"}).size();
-  auto const& msg_no_hash = message.clean_string ().mid(22).remove("<").remove(">");
   bool is_OK=false;
-  if(m_mode=="MSK144" && msg_no_hash.indexOf(ui->dxCallEntry->text()+" R ")>0) is_OK=true;
+  if(m_mode=="MSK144" and message.clean_string ().indexOf(ui->dxCallEntry->text()+" R ")>0) is_OK=true;
   if (message_words.size () > 3 && (message.isStandardMessage() || (is_73 or is_OK))) {
     auto df = message.frequencyOffset ();
     auto within_tolerance = (qAbs (ui->RxFreqSpinBox->value () - df) <= int (start_tolerance)
@@ -3660,7 +3659,7 @@ void MainWindow::auto_sequence (DecodedText const& message, unsigned start_toler
                || message_words.contains ("DE")))
           || !message.isStandardMessage ()); // free text 73/RR73
 
-    auto const& w = msg_no_hash.split(" ",SkipEmptyParts);
+    QStringList w=message.clean_string ().mid(22).remove("<").remove(">").split(" ",SkipEmptyParts);
     QString w2;
     int nrpt=0;
     if (w.size () > 2)
@@ -7770,7 +7769,7 @@ void MainWindow::replyToCQ (QTime time, qint32 snr, float delta_time, quint32 de
   QString format_string {"%1 %2 %3 %4 %5 %6"};
   auto const& time_string = time.toString ("~" == mode || "&" == mode || "+" == mode
                                            || (m_TRperiod < 60. && ("`" == mode || ":" == mode))
-                                           ? "hhmmss" : "hhmm");
+                                             ? "hhmmss" : "hhmm");
   auto text = message_text;
   auto ap_pos = text.lastIndexOf (QRegularExpression {R"((?:\?\s)?(?:a[0-9]|q[0-9][0-9]?)$)"});
   if (ap_pos >= 0)