mirror of
https://github.com/g4klx/MMDVMHost.git
synced 2026-04-05 14:35:31 +00:00
Merge branch 'master' into mqtt
This commit is contained in:
commit
2ac5b1bcfe
12 changed files with 182 additions and 139 deletions
|
|
@ -656,6 +656,8 @@ void CDStarControl::writeEndRF()
|
|||
{
|
||||
m_rfState = RS_RF_LISTENING;
|
||||
|
||||
m_rfTimeoutTimer.stop();
|
||||
|
||||
if (m_netState == RS_NET_IDLE) {
|
||||
m_display->clearDStar();
|
||||
|
||||
|
|
@ -663,8 +665,6 @@ void CDStarControl::writeEndRF()
|
|||
|
||||
if (m_network != NULL)
|
||||
m_network->reset();
|
||||
} else {
|
||||
m_rfTimeoutTimer.stop();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue