From ed9ee365079abdb1fe088e892b8878a725a46ba1 Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Fri, 28 Jul 2023 12:54:37 -0400 Subject: [PATCH] i thought i removed this check, damn it Git; ensure we immediately return after a grant demand; --- src/p25/Control.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/p25/Control.cpp b/src/p25/Control.cpp index d6ff4f81..03720701 100644 --- a/src/p25/Control.cpp +++ b/src/p25/Control.cpp @@ -1221,9 +1221,7 @@ void Control::processNetwork() break; } - if (!m_dedicatedControl) { - ret = m_voice->processNetwork(data.get(), frameLength, control, lsd, duid, frameType); - } + ret = m_voice->processNetwork(data.get(), frameLength, control, lsd, duid, frameType); break; case P25_DUID_TDU: @@ -1242,6 +1240,8 @@ void Control::processNetwork() LogError(LOG_NET, P25_TSDU_STR " call failure, network call not granted, dstId = %u", dstId); return; } + + return; } m_voice->processNetwork(data.get(), frameLength, control, lsd, duid, frameType);