Skip to content

Commit 6b43bce

Browse files
authored
Merge pull request #690 from f1rmb/f1rmb_fix_network_isConnected
Fix *Network::isConnected().
2 parents d26f3ea + b5420fe commit 6b43bce

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

DMRGatewayNetwork.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ bool CDMRGatewayNetwork::writeTalkerAlias(unsigned int id, unsigned char type, c
289289

290290
bool CDMRGatewayNetwork::isConnected() const
291291
{
292-
return (m_enabled && (m_addrLen != 0));
292+
return (m_addrLen != 0);
293293
}
294294

295295
void CDMRGatewayNetwork::close()

DStarNetwork.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ void CDStarNetwork::reset()
316316

317317
bool CDStarNetwork::isConnected() const
318318
{
319-
return (m_enabled && (m_addrLen != 0));
319+
return (m_addrLen != 0);
320320
}
321321

322322
void CDStarNetwork::close()

NXDNIcomNetwork.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ void CNXDNIcomNetwork::reset()
155155

156156
bool CNXDNIcomNetwork::isConnected() const
157157
{
158-
return (m_enabled && (m_addrLen != 0));
158+
return (m_addrLen != 0);
159159
}
160160

161161
void CNXDNIcomNetwork::close()

NXDNKenwoodNetwork.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -837,7 +837,7 @@ void CNXDNKenwoodNetwork::reset()
837837

838838
bool CNXDNKenwoodNetwork::isConnected() const
839839
{
840-
return (m_enabled && (m_rtcpAddrLen != 0U) && (m_rtpAddrLen != 0U));
840+
return ((m_rtcpAddrLen != 0U) && (m_rtpAddrLen != 0U));
841841
}
842842

843843
void CNXDNKenwoodNetwork::close()

P25Network.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ unsigned int CP25Network::read(unsigned char* data, unsigned int length)
426426

427427
bool CP25Network::isConnected() const
428428
{
429-
return (m_enabled && (m_addrLen != 0));
429+
return (m_addrLen != 0);
430430
}
431431

432432
void CP25Network::close()

YSFNetwork.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ void CYSFNetwork::reset()
185185

186186
bool CYSFNetwork::isConnected() const
187187
{
188-
return (m_enabled && (m_addrLen != 0));
188+
return (m_addrLen != 0);
189189
}
190190

191191
void CYSFNetwork::close()

0 commit comments

Comments
 (0)