From ffd2ad4dc01031176a49234bd0b66b754810f2d1 Mon Sep 17 00:00:00 2001
From: Bill Somerville <bill@classdesign.com>
Date: Wed, 22 Jul 2020 01:05:14 +0100
Subject: [PATCH 1/2] Narrower decodes display and move AP info into extra
 appended info

---
 widgets/displaytext.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/widgets/displaytext.cpp b/widgets/displaytext.cpp
index 6d807c353..2f19774de 100644
--- a/widgets/displaytext.cpp
+++ b/widgets/displaytext.cpp
@@ -434,7 +434,13 @@ void DisplayText::displayDecodedText(DecodedText const& decodedText, QString con
   QString extra;
   if (haveFSpread)
     {
-      extra = QString {"%1"}.arg (fSpread, 5, 'f', fSpread < 0.95 ? 3 : 2) + QChar {' '};
+      extra += QString {"%1"}.arg (fSpread, 5, 'f', fSpread < 0.95 ? 3 : 2) + QChar {' '};
+    }
+  auto ap_pos = message.lastIndexOf (QRegularExpression {R"((?:\?\s)?a[0-9]$)"});
+  if (ap_pos >= 0)
+    {
+      extra += message.mid (ap_pos) + QChar {' '};
+      message = message.left (ap_pos).trimmed ();
     }
   m_CQPriority="";
   if (CQcall)

From 51f692d8d4b71c22a73dc12024a58fc7544c94d0 Mon Sep 17 00:00:00 2001
From: Bill Somerville <bill@classdesign.com>
Date: Wed, 22 Jul 2020 18:01:06 +0100
Subject: [PATCH 2/2] Avoid double Tx periods in WSPR modes when changing
 scheduling basis

---
 widgets/mainwindow.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp
index 615fb1dfa..fcad7d1f3 100644
--- a/widgets/mainwindow.cpp
+++ b/widgets/mainwindow.cpp
@@ -5606,6 +5606,8 @@ void MainWindow::on_tx6_editingFinished()                       //tx6 edited
 void MainWindow::on_RoundRobin_currentTextChanged(QString text)
 {
   ui->sbTxPercent->setEnabled(text=="Random");
+  m_WSPR_tx_next = false;       // cancel any pending Tx to avoid
+                                // undesirable consecutive Tx periods
 }