From 45013ac1798f7590006df08c838c3b6fb7776aec Mon Sep 17 00:00:00 2001 From: SASANO Takayoshi Date: Mon, 17 Feb 2020 19:57:47 +0900 Subject: [PATCH] Lookup name on DMR network late entry (2) There is two cases that shows "received network late entry" 1. dataType == DT_VOICE_PI_HEADER && m_netState != RS_NET_AUDIO 2. dataType == DT_VOICE_SYNC && m_netState == RS_NET_IDLE case 1 is already treated. this fix is for case 2. --- DMRSlot.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/DMRSlot.cpp b/DMRSlot.cpp index a7595fb..8ebbce4 100644 --- a/DMRSlot.cpp +++ b/DMRSlot.cpp @@ -1367,8 +1367,9 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) std::string src = m_lookup->find(srcId); std::string dst = m_lookup->find(dstId); + std::string cn = m_lookup->findWithName(srcId); - m_display->writeDMR(m_slotNo, src, m_netLC->getFLCO() == FLCO_GROUP, dst, "N"); + m_display->writeDMR(m_slotNo, cn, m_netLC->getFLCO() == FLCO_GROUP, dst, "N"); LogMessage("DMR Slot %u, received network late entry from %s to %s%s", m_slotNo, src.c_str(), m_netLC->getFLCO() == FLCO_GROUP ? "TG " : "", dst.c_str()); }