From 1437fca2f2b1cb42cd79e7802c62a880986b0745 Mon Sep 17 00:00:00 2001
From: Jonathan Naylor <naylorjs@yahoo.com>
Date: Thu, 27 Jul 2017 16:39:14 +0100
Subject: [PATCH] Suppress the ack when Ack=0 in a less buggy way.

---
 DStarControl.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/DStarControl.cpp b/DStarControl.cpp
index 02abbde..b36608e 100644
--- a/DStarControl.cpp
+++ b/DStarControl.cpp
@@ -525,8 +525,7 @@ void CDStarControl::writeEndRF()
 	if (m_netState == RS_NET_IDLE) {
 		m_display->clearDStar();
 
-		if (m_ackReply)
-			m_ackTimer.start();
+		m_ackTimer.start();
 
 		if (m_network != NULL)
 			m_network->reset();
@@ -1014,6 +1013,9 @@ void CDStarControl::sendAck()
 {
 	m_rfTimeoutTimer.stop();
 
+	if (!m_ackReply)
+		return;
+
 	unsigned char user[DSTAR_LONG_CALLSIGN_LENGTH];
 	m_rfHeader.getMyCall1(user);