mirror of
https://github.com/g4klx/MMDVMHost
synced 2025-12-24 01:25:41 +08:00
Merge pull request #690 from f1rmb/f1rmb_fix_network_isConnected
Fix *Network::isConnected().
This commit is contained in:
@@ -289,7 +289,7 @@ bool CDMRGatewayNetwork::writeTalkerAlias(unsigned int id, unsigned char type, c
|
|||||||
|
|
||||||
bool CDMRGatewayNetwork::isConnected() const
|
bool CDMRGatewayNetwork::isConnected() const
|
||||||
{
|
{
|
||||||
return (m_enabled && (m_addrLen != 0));
|
return (m_addrLen != 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CDMRGatewayNetwork::close()
|
void CDMRGatewayNetwork::close()
|
||||||
|
|||||||
@@ -316,7 +316,7 @@ void CDStarNetwork::reset()
|
|||||||
|
|
||||||
bool CDStarNetwork::isConnected() const
|
bool CDStarNetwork::isConnected() const
|
||||||
{
|
{
|
||||||
return (m_enabled && (m_addrLen != 0));
|
return (m_addrLen != 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CDStarNetwork::close()
|
void CDStarNetwork::close()
|
||||||
|
|||||||
@@ -155,7 +155,7 @@ void CNXDNIcomNetwork::reset()
|
|||||||
|
|
||||||
bool CNXDNIcomNetwork::isConnected() const
|
bool CNXDNIcomNetwork::isConnected() const
|
||||||
{
|
{
|
||||||
return (m_enabled && (m_addrLen != 0));
|
return (m_addrLen != 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CNXDNIcomNetwork::close()
|
void CNXDNIcomNetwork::close()
|
||||||
|
|||||||
@@ -837,7 +837,7 @@ void CNXDNKenwoodNetwork::reset()
|
|||||||
|
|
||||||
bool CNXDNKenwoodNetwork::isConnected() const
|
bool CNXDNKenwoodNetwork::isConnected() const
|
||||||
{
|
{
|
||||||
return (m_enabled && (m_rtcpAddrLen != 0U) && (m_rtpAddrLen != 0U));
|
return ((m_rtcpAddrLen != 0U) && (m_rtpAddrLen != 0U));
|
||||||
}
|
}
|
||||||
|
|
||||||
void CNXDNKenwoodNetwork::close()
|
void CNXDNKenwoodNetwork::close()
|
||||||
|
|||||||
@@ -426,7 +426,7 @@ unsigned int CP25Network::read(unsigned char* data, unsigned int length)
|
|||||||
|
|
||||||
bool CP25Network::isConnected() const
|
bool CP25Network::isConnected() const
|
||||||
{
|
{
|
||||||
return (m_enabled && (m_addrLen != 0));
|
return (m_addrLen != 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CP25Network::close()
|
void CP25Network::close()
|
||||||
|
|||||||
@@ -185,7 +185,7 @@ void CYSFNetwork::reset()
|
|||||||
|
|
||||||
bool CYSFNetwork::isConnected() const
|
bool CYSFNetwork::isConnected() const
|
||||||
{
|
{
|
||||||
return (m_enabled && (m_addrLen != 0));
|
return (m_addrLen != 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CYSFNetwork::close()
|
void CYSFNetwork::close()
|
||||||
|
|||||||
Reference in New Issue
Block a user