From e600cf36bba56916b12cb9b79321f93370ea8ed7 Mon Sep 17 00:00:00 2001
From: Jonathan Naylor <naylorjs@yahoo.com>
Date: Sat, 21 May 2016 12:32:36 +0100
Subject: [PATCH] Roll back holdoff timer changes.

---
 DStarControl.cpp | 5 +----
 YSFControl.cpp   | 4 +---
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/DStarControl.cpp b/DStarControl.cpp
index f9760e6..c28a9e5 100644
--- a/DStarControl.cpp
+++ b/DStarControl.cpp
@@ -171,9 +171,7 @@ bool CDStarControl::writeModem(unsigned char *data)
 
 		m_rfHeader = header;
 
-		if (m_netState == RS_NET_IDLE)
-			m_holdoffTimer.stop();
-
+		m_holdoffTimer.stop();
 		m_ackTimer.stop();
 
 		m_rfBits = 1U;
@@ -468,7 +466,6 @@ void CDStarControl::writeNetwork()
 
 		m_netHeader = header;
 
-		m_holdoffTimer.start();
 		m_netTimeoutTimer.start();
 		m_packetTimer.start();
 		m_elapsed.start();
diff --git a/YSFControl.cpp b/YSFControl.cpp
index 5bdbcbd..5e3cdde 100644
--- a/YSFControl.cpp
+++ b/YSFControl.cpp
@@ -84,8 +84,7 @@ bool CYSFControl::writeModem(unsigned char *data)
 		if (fi == YSF_FI_TERMINATOR)
 			return false;
 
-		if (m_netState == RS_NET_IDLE)
-			m_holdoffTimer.stop();
+		m_holdoffTimer.stop();
 
 		m_rfFrames = 0U;
 		m_rfErrs = 0U;
@@ -365,7 +364,6 @@ void CYSFControl::writeNetwork()
 		LogMessage("YSF, received network data from %10.10s to %10.10s at %10.10s", m_netSource, m_netDest, data + 4U);
 
 		m_netTimeoutTimer.start();
-		m_holdoffTimer.start();
 		m_netState = RS_NET_AUDIO;
 		m_netFrames = 0U;
 	} else {