From e565a996f8010797118bc28528738233108654a9 Mon Sep 17 00:00:00 2001
From: Andy CA6JAU <juribeparada@gmail.com>
Date: Wed, 5 Sep 2018 22:50:20 -0300
Subject: [PATCH] Add OE1KBC fix for XLX

---
 NXDN2DMR/NXDN2DMR.cpp | 5 +++++
 NXDN2DMR/Version.h    | 2 +-
 YSF2DMR/Version.h     | 2 +-
 YSF2DMR/YSF2DMR.cpp   | 3 +++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/NXDN2DMR/NXDN2DMR.cpp b/NXDN2DMR/NXDN2DMR.cpp
index cf77c3d..c20dfef 100644
--- a/NXDN2DMR/NXDN2DMR.cpp
+++ b/NXDN2DMR/NXDN2DMR.cpp
@@ -347,6 +347,8 @@ int CNXDN2DMR::run()
 						std::string netDst = m_nxdnlookup->findCS(m_nxdnDst);
 						LogMessage("Received NXDN header from %s to %s%s", netSrc.c_str(), grp ? "TG " : "", netDst.c_str());
 
+						m_dmrNetwork->reset(2U);	// OE1KBC fix
+
 						m_conv.putNXDNHeader();
 						m_nxdnFrames = 0U;
 						m_nxdninfo = true;
@@ -357,6 +359,9 @@ int CNXDN2DMR::run()
 							std::string netSrc = m_nxdnlookup->findCS(m_nxdnSrc);
 							std::string netDst = m_nxdnlookup->findCS(m_nxdnDst);
 							LogMessage("Received NXDN late entry from %s to %s%s", netSrc.c_str(), grp ? "TG " : "", netDst.c_str());
+
+							m_dmrNetwork->reset(2U);	// OE1KBC fix
+
 							m_conv.putNXDNHeader();
 							m_nxdninfo = true;
 						}
diff --git a/NXDN2DMR/Version.h b/NXDN2DMR/Version.h
index e408958..01edde1 100644
--- a/NXDN2DMR/Version.h
+++ b/NXDN2DMR/Version.h
@@ -20,6 +20,6 @@
 #if !defined(VERSION_H)
 #define	VERSION_H
 
-const char* VERSION = "20180809";
+const char* VERSION = "20180905";
 
 #endif
diff --git a/YSF2DMR/Version.h b/YSF2DMR/Version.h
index 3a40f89..01edde1 100644
--- a/YSF2DMR/Version.h
+++ b/YSF2DMR/Version.h
@@ -20,6 +20,6 @@
 #if !defined(VERSION_H)
 #define	VERSION_H
 
-const char* VERSION = "20180904";
+const char* VERSION = "20180905";
 
 #endif
diff --git a/YSF2DMR/YSF2DMR.cpp b/YSF2DMR/YSF2DMR.cpp
index 80d5585..4f75370 100644
--- a/YSF2DMR/YSF2DMR.cpp
+++ b/YSF2DMR/YSF2DMR.cpp
@@ -571,6 +571,9 @@ int CYSF2DMR::run()
 							std::string ysfSrc = ysfPayload.getSource();
 							std::string ysfDst = ysfPayload.getDest();
 							LogMessage("Received YSF Header: Src: %s Dst: %s", ysfSrc.c_str(), ysfDst.c_str());
+							
+							m_dmrNetwork->reset(2U);	// OE1KBC fix
+							
 							m_srcid = findYSFID(ysfSrc, true);
 							m_conv.putYSFHeader();
 							m_ysfFrames = 0U;