From 3675153d115b41f957f220db00e029493e757d7a Mon Sep 17 00:00:00 2001
From: Jonathan Naylor <naylorjs@yahoo.com>
Date: Tue, 29 Mar 2016 17:59:15 +0100
Subject: [PATCH] Use an explicit mode change for DMR.

---
 MMDVMHost.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/MMDVMHost.cpp b/MMDVMHost.cpp
index b68ea4e..41e0785 100644
--- a/MMDVMHost.cpp
+++ b/MMDVMHost.cpp
@@ -604,10 +604,9 @@ void CMMDVMHost::setMode(unsigned char mode, bool logging)
 		if (m_dstarNetwork != NULL)
 			m_dstarNetwork->enable(false);
 		m_display->setDMR();
+		m_modem->setMode(MODE_DMR);
 		if (m_duplex)
 			m_modem->writeDMRStart(true);
-		else
-			m_modem->setMode(MODE_DMR);
 		m_mode = MODE_DMR;
 		m_modeTimer.start();
 		break;
@@ -634,8 +633,7 @@ void CMMDVMHost::setMode(unsigned char mode, bool logging)
 			m_dmrNetwork->enable(false);
 		if (m_mode == MODE_DMR && m_duplex)
 			m_modem->writeDMRStart(false);
-		else
-			m_modem->setMode(MODE_IDLE);
+		m_modem->setMode(MODE_IDLE);
 		m_display->setLockout();
 		m_mode = MODE_LOCKOUT;
 		m_modeTimer.stop();
@@ -662,8 +660,7 @@ void CMMDVMHost::setMode(unsigned char mode, bool logging)
 			m_dmrNetwork->enable(true);
 		if (m_mode == MODE_DMR && m_duplex)
 			m_modem->writeDMRStart(false);
-		else
-			m_modem->setMode(MODE_IDLE);
+		m_modem->setMode(MODE_IDLE);
 		m_display->setIdle();
 		m_mode = MODE_IDLE;
 		m_modeTimer.stop();