From 00dfa56dcb025411163115ce5e0a8dfb66f5eb58 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Thu, 29 Sep 2016 20:23:19 +0100 Subject: [PATCH] Revert "Revert the move of the timer." This reverts commit 21a786329e19a400f55c95120b5d3d787ac061c2. --- DStarControl.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/DStarControl.cpp b/DStarControl.cpp index c09b66f..9373586 100644 --- a/DStarControl.cpp +++ b/DStarControl.cpp @@ -470,7 +470,7 @@ void CDStarControl::writeNetwork() m_netTimeoutTimer.start(); m_packetTimer.start(); - m_elapsed.start(); + //m_elapsed.start(); // commented out and placed lower down due to delay introduced somewhere below here. m_ackTimer.stop(); m_lastFrameValid = false; @@ -501,6 +501,11 @@ void CDStarControl::writeNetwork() m_display->writeDStar((char*)my1, (char*)my2, (char*)your, "N", (char*) " "); LogMessage("D-Star, received network header from %8.8s/%4.4s to %8.8s", my1, my2, your); } + + // Something just above here introduces a large delay forcing erroneous(?) insertion of silence packets. + // Starting the elapsed timer here instead of the commented out position above solves that. + m_elapsed.start(); + } else if (type == TAG_EOT) { if (m_netState != RS_NET_AUDIO) return;