Fixed the crash in a clean way.

This commit is contained in:
Jonathan Naylor
2018-06-18 22:10:56 +01:00
parent 282bffb3c4
commit 14bb1339ac

View File

@@ -165,6 +165,9 @@ void CPOCSAGControl::clock(unsigned int ms)
} }
} else if (m_state == PS_SENDING) { } else if (m_state == PS_SENDING) {
if (m_buffer.empty()) { if (m_buffer.empty()) {
m_output.push_back(POCSAG_IDLE_WORD);
m_output.push_back(POCSAG_IDLE_WORD);
bool ret = processData(); bool ret = processData();
if (ret) { if (ret) {
m_display->writePOCSAG(m_ric, m_text); m_display->writePOCSAG(m_ric, m_text);
@@ -181,17 +184,6 @@ void CPOCSAGControl::clock(unsigned int ms)
m_output.push_back(w1); m_output.push_back(w1);
m_output.push_back(w2); m_output.push_back(w2);
if (m_buffer.empty()) {
bool ret = processData();
if (ret) {
m_display->writePOCSAG(m_ric, m_text);
m_state = PS_WAITING;
m_count++;
} else {
m_state = PS_ENDING;
}
}
} }
} else { // PS_ENDING } else { // PS_ENDING
m_output.push_back(POCSAG_IDLE_WORD); m_output.push_back(POCSAG_IDLE_WORD);