From 6a44e68033e1088c0714adf39a050024635e157d Mon Sep 17 00:00:00 2001
From: Bill Somerville <bill@classdesign.com>
Date: Fri, 27 Nov 2020 12:36:24 +0000
Subject: [PATCH] Repair regression that stopped Best S&P transmitting on a
 match

This change also ensures that second or subsequent matches in the same
T/R period do not trigger a QSO with a new QSO partner.
---
 widgets/displaytext.cpp | 1 +
 widgets/displaytext.h   | 3 +--
 widgets/mainwindow.cpp  | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/widgets/displaytext.cpp b/widgets/displaytext.cpp
index d498f180e..b083defc0 100644
--- a/widgets/displaytext.cpp
+++ b/widgets/displaytext.cpp
@@ -15,6 +15,7 @@
 #include <QScrollBar>
 
 #include "Configuration.hpp"
+#include "Decoder/decodedtext.h"
 #include "Network/LotWUsers.hpp"
 #include "models/DecodeHighlightingModel.hpp"
 #include "logbook/logbook.h"
diff --git a/widgets/displaytext.h b/widgets/displaytext.h
index 3b577e619..773901cea 100644
--- a/widgets/displaytext.h
+++ b/widgets/displaytext.h
@@ -8,11 +8,10 @@
 #include <QPair>
 #include <QString>
 
-#include "Decoder/decodedtext.h"
-
 class QAction;
 class Configuration;
 class LogBook;
+class DecodedText;
 
 class DisplayText
   : public QTextEdit
diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp
index eafa76545..701649aa1 100644
--- a/widgets/mainwindow.cpp
+++ b/widgets/mainwindow.cpp
@@ -3441,19 +3441,21 @@ void MainWindow::readFromStdout()                             //readFromStdout
                                                      ui->cbCQonly->isVisible() && ui->cbCQonly->isChecked(),
                                                      haveFSpread, fSpread);
 
-          if(m_bBestSPArmed and m_mode=="FT4") {
+          if(m_bBestSPArmed && m_mode=="FT4" && CALLING == m_QSOProgress) {
             QString messagePriority=ui->decodedTextBrowser->CQPriority();
             if(messagePriority!="") {
               if(messagePriority=="New Call on Band"
                  and m_BestCQpriority!="New Call on Band"
                  and m_BestCQpriority!="New Multiplier") {
                 m_BestCQpriority="New Call on Band";
+                m_bDoubleClicked = true;
                 processMessage(decodedtext0);
               }
               if(messagePriority=="New DXCC"
                  and m_BestCQpriority!="New DXCC"
                  and m_BestCQpriority!="New Multiplier") {
                 m_BestCQpriority="New DXCC";
+                m_bDoubleClicked = true;
                 processMessage(decodedtext0);
               }
             }