NXDN: process SACCH message only if decode is valid

f4exb · Jun 22, 2018 · dd7e4da · dd7e4da
1 parent b4af024
commit dd7e4da
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/nxdn.cpp b/nxdn.cpp
@@ -718,17 +718,18 @@ void DSDNXDN::processRTDCH(int index, unsigned char dibit)
         {
             m_sacch.unpuncture();
 
-            if (m_sacch.decode()) {
+            if (m_sacch.decode())
+            {
                 m_ran = m_sacch.getRAN();
-            }
 
-            if ((m_sacch.getCountdown() == 0) && (m_sacch.getDecodeCount() == 0))
-            {
-                m_currentMessage = m_sacch.getMessage();
-                m_messageType = m_currentMessage.getMessageType();
-                m_currentMessage.getSourceUnitId(m_sourceId);
-                m_currentMessage.getDestinationGroupId(m_destinationId);
-                m_currentMessage.isGroupCall(m_group);
+                if ((m_sacch.getCountdown() == 0) && (m_sacch.getDecodeCount() == 0))
+                {
+                    m_currentMessage = m_sacch.getMessage();
+                    m_messageType = m_currentMessage.getMessageType();
+                    m_currentMessage.getSourceUnitId(m_sourceId);
+                    m_currentMessage.getDestinationGroupId(m_destinationId);
+                    m_currentMessage.isGroupCall(m_group);
+                }
             }
         }