diff --git a/DMRNetwork.cpp b/DMRNetwork.cpp index c9f8ca5..8ea7dc6 100644 --- a/DMRNetwork.cpp +++ b/DMRNetwork.cpp @@ -102,6 +102,10 @@ bool CDMRNetwork::open() LogMessage("%s, Opening DMR Network", m_name.c_str()); + bool ret = m_socket.open(m_addr); + if (!ret) + return false; + m_status = WAITING_CONNECT; m_timeoutTimer.stop(); m_retryTimer.start(); @@ -325,16 +329,12 @@ void CDMRNetwork::clock(unsigned int ms) if (m_status == WAITING_CONNECT) { m_retryTimer.clock(ms); if (m_retryTimer.isRunning() && m_retryTimer.hasExpired()) { - bool ret = m_socket.open(m_addr); - if (ret) { - ret = writeLogin(); - if (!ret) - return; - - m_status = WAITING_LOGIN; - m_timeoutTimer.start(); - } + bool ret = writeLogin(); + if (!ret) + return; + m_status = WAITING_LOGIN; + m_timeoutTimer.start(); m_retryTimer.start(); } diff --git a/Version.h b/Version.h index f31a5c8..babe5a0 100644 --- a/Version.h +++ b/Version.h @@ -19,6 +19,6 @@ #if !defined(VERSION_H) #define VERSION_H -const char* VERSION = "20240129"; +const char* VERSION = "20240202"; #endif