From 399eb105dd2314149c9aae20a1c9655e00096dc3 Mon Sep 17 00:00:00 2001 From: Tom Early Date: Tue, 7 Jul 2020 21:24:40 -0700 Subject: [PATCH] fixed problem with DMRMMDVM and DPLUS --- src/cdmrmmdvmprotocol.cpp | 2 +- src/cdplusprotocol.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cdmrmmdvmprotocol.cpp b/src/cdmrmmdvmprotocol.cpp index 4bb646d..926d2d0 100644 --- a/src/cdmrmmdvmprotocol.cpp +++ b/src/cdmrmmdvmprotocol.cpp @@ -90,7 +90,7 @@ void CDmrmmdvmProtocol::Task(void) CDvLastFramePacket *LastFrame; // handle incoming packets - if ( m_Socket6.Receive(Buffer, Ip, 10) || m_Socket6.Receive(Buffer, Ip, 10) ) + if ( m_Socket6.Receive(Buffer, Ip, 10) || m_Socket4.Receive(Buffer, Ip, 10) ) { //Buffer.DebugDump(g_Reflector.m_DebugFile); // crack the packet diff --git a/src/cdplusprotocol.cpp b/src/cdplusprotocol.cpp index 0fa95b9..11ff4ef 100644 --- a/src/cdplusprotocol.cpp +++ b/src/cdplusprotocol.cpp @@ -62,7 +62,7 @@ void CDplusProtocol::Task(void) CDvLastFramePacket *LastFrame; // handle incoming packets - if ( m_Socket6.Receive(Buffer, Ip, 10) && m_Socket4.Receive(Buffer, Ip, 10) ) + if ( m_Socket6.Receive(Buffer, Ip, 10) || m_Socket4.Receive(Buffer, Ip, 10) ) { // crack the packet if ( (Frame = IsValidDvFramePacket(Buffer)) != NULL )