From b0369d272adca813ba9fa1906e2b0b90bf8ce524 Mon Sep 17 00:00:00 2001
From: Bryan Biedenkapp <gatekeep@gmail.com>
Date: Thu, 17 Oct 2024 23:21:47 -0400
Subject: [PATCH] if for some reason, you have grant demands, and are a
 conventional/DVRS site, don't handle any grant demands if traffic is in
 progress;

---
 src/host/p25/Control.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/host/p25/Control.cpp b/src/host/p25/Control.cpp
index 0cb7a7c9..d483fb49 100644
--- a/src/host/p25/Control.cpp
+++ b/src/host/p25/Control.cpp
@@ -1411,6 +1411,12 @@ void Control::processNetwork()
                     return;
                 }
 
+                // if we're non-dedicated control, and if we're not in a listening or idle state, ignore any grant
+                // demands
+                if (!m_dedicatedControl && (m_rfState != RS_RF_LISTENING || m_netState != RS_NET_IDLE)) {
+                    return;
+                }
+
                 // validate source RID
                 if (!acl::AccessControl::validateSrcId(srcId)) {
                     return;