From f9f81b9b8eda8321166808eabe79204cd51ea4eb Mon Sep 17 00:00:00 2001
From: Jonathan Naylor <naylorjs@yahoo.com>
Date: Mon, 18 May 2020 11:09:56 +0100
Subject: [PATCH] Try and make the closing callsign appear.

(cherry picked from commit 063b21f9991e4da949d11ca901127da64c66f664)
---
 FM.cpp      | 2 +-
 FMKeyer.cpp | 5 +++++
 FMKeyer.h   | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/FM.cpp b/FM.cpp
index 8660615..de26c10 100644
--- a/FM.cpp
+++ b/FM.cpp
@@ -316,7 +316,7 @@ void CFM::stateMachine(bool validRFSignal, bool validExtSignal)
       break;
   }
 
-  if (m_state == FS_LISTENING && !m_rfAck.isRunning() && !m_extAck.isRunning()) {
+  if (m_state == FS_LISTENING && !m_rfAck.isWanted() && !m_extAck.isWanted() && !m_callsign.isWanted()) {
     m_outputRFRB.reset();
     m_downsampler.reset();
   }
diff --git a/FMKeyer.cpp b/FMKeyer.cpp
index 8109fb0..851441e 100644
--- a/FMKeyer.cpp
+++ b/FMKeyer.cpp
@@ -205,6 +205,11 @@ void CFMKeyer::stop()
   m_audioPos = 0U;
 }
 
+bool CFMKeyer::isWanted() const
+{
+  return m_wanted;
+}
+
 bool CFMKeyer::isRunning() const
 {
   return m_poPos > 0U || m_dotPos > 0U || m_audioPos > 0U;
diff --git a/FMKeyer.h b/FMKeyer.h
index 799e85c..5b7bef5 100644
--- a/FMKeyer.h
+++ b/FMKeyer.h
@@ -35,6 +35,8 @@ public:
 
   bool isRunning() const;
 
+  bool isWanted() const;
+
 private:
   bool     m_wanted;
   uint8_t  m_poBuffer[1000U];