Merge branch 'master' into fast_data

This commit is contained in:
Jonathan Naylor 2019-01-26 12:57:59 +00:00
commit 6c07786f1b

View file

@ -978,7 +978,7 @@ int CMMDVMHost::run()
dmrBeaconIntervalTimer.clock(ms);
if (dmrBeaconIntervalTimer.isRunning() && dmrBeaconIntervalTimer.hasExpired()) {
if ((m_mode == MODE_IDLE || m_mode == MODE_DMR) && !m_modem->hasTX()) {
if (!m_fixedMode)
if (!m_fixedMode && m_mode == MODE_IDLE)
setMode(MODE_DMR);
dmrBeaconIntervalTimer.start();
dmrBeaconDurationTimer.start();