Merge pull request #690 from f1rmb/f1rmb_fix_network_isConnected

Fix *Network::isConnected().
This commit is contained in:
Jonathan Naylor 2021-03-23 22:54:43 +00:00 committed by GitHub
commit 6b43bce561
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 6 deletions

View File

@ -289,7 +289,7 @@ bool CDMRGatewayNetwork::writeTalkerAlias(unsigned int id, unsigned char type, c
bool CDMRGatewayNetwork::isConnected() const
{
return (m_enabled && (m_addrLen != 0));
return (m_addrLen != 0);
}
void CDMRGatewayNetwork::close()

View File

@ -316,7 +316,7 @@ void CDStarNetwork::reset()
bool CDStarNetwork::isConnected() const
{
return (m_enabled && (m_addrLen != 0));
return (m_addrLen != 0);
}
void CDStarNetwork::close()

View File

@ -155,7 +155,7 @@ void CNXDNIcomNetwork::reset()
bool CNXDNIcomNetwork::isConnected() const
{
return (m_enabled && (m_addrLen != 0));
return (m_addrLen != 0);
}
void CNXDNIcomNetwork::close()

View File

@ -837,7 +837,7 @@ void CNXDNKenwoodNetwork::reset()
bool CNXDNKenwoodNetwork::isConnected() const
{
return (m_enabled && (m_rtcpAddrLen != 0U) && (m_rtpAddrLen != 0U));
return ((m_rtcpAddrLen != 0U) && (m_rtpAddrLen != 0U));
}
void CNXDNKenwoodNetwork::close()

View File

@ -426,7 +426,7 @@ unsigned int CP25Network::read(unsigned char* data, unsigned int length)
bool CP25Network::isConnected() const
{
return (m_enabled && (m_addrLen != 0));
return (m_addrLen != 0);
}
void CP25Network::close()

View File

@ -185,7 +185,7 @@ void CYSFNetwork::reset()
bool CYSFNetwork::isConnected() const
{
return (m_enabled && (m_addrLen != 0));
return (m_addrLen != 0);
}
void CYSFNetwork::close()