Merge pull request #690 from f1rmb/f1rmb_fix_network_isConnected

Fix *Network::isConnected().
g4klx · Mar 23, 2021 · 6b43bce · 6b43bce
2 parents d26f3ea + b5420fe
commit 6b43bce
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/DMRGatewayNetwork.cpp b/DMRGatewayNetwork.cpp
@@ -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()

diff --git a/DStarNetwork.cpp b/DStarNetwork.cpp
@@ -316,7 +316,7 @@ void CDStarNetwork::reset()
 
 bool CDStarNetwork::isConnected() const
 {
-	return (m_enabled && (m_addrLen != 0));
+	return (m_addrLen != 0);
 }
 
 void CDStarNetwork::close()

diff --git a/NXDNIcomNetwork.cpp b/NXDNIcomNetwork.cpp
@@ -155,7 +155,7 @@ void CNXDNIcomNetwork::reset()
 
 bool CNXDNIcomNetwork::isConnected() const
 {
-	return (m_enabled && (m_addrLen != 0));
+	return (m_addrLen != 0);
 }
 
 void CNXDNIcomNetwork::close()

diff --git a/NXDNKenwoodNetwork.cpp b/NXDNKenwoodNetwork.cpp
@@ -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()

diff --git a/P25Network.cpp b/P25Network.cpp
@@ -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()

diff --git a/YSFNetwork.cpp b/YSFNetwork.cpp
@@ -185,7 +185,7 @@ void CYSFNetwork::reset()
 
 bool CYSFNetwork::isConnected() const
 {
-	return (m_enabled && (m_addrLen != 0));
+	return (m_addrLen != 0);
 }
 
 void CYSFNetwork::close()