Superminaren
/
MMDVM
mirror of https://github.com/g4klx/MMDVM.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix merge gone wrong in DMRTX.cpp

This commit is contained in:
adrian 2026-04-19 11:12:37 +03:00
parent a696fd454c
commit 30ba4c4c55
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DMRTX.cpp
View File

@ -378,7 +378,9 @@ void CDMRTX::createCACH(uint8_t txSlotIndex, uint8_t rxSlotIndex)
m_cachPtr = 0U; m_cachPtr = 0U;
if (m_cachPtr == 0U) { if (m_cachPtr == 0U) {
if (m_fifo[0U].getData() == 0U && m_fifo[1U].getData() == 0U) if ((m_fifo[0U].getData() == 0U && m_fifo[1U].getData() == 0U) && !m_trunking)
::memcpy(m_shortLC, EMPTY_SHORT_LC, 12U);
else
::memcpy(m_shortLC, m_newShortLC, 12U); ::memcpy(m_shortLC, m_newShortLC, 12U);
} }