Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ntcore] NetworkClient::Disconnect: Add null check (#5112)

Browse Source
This commit is contained in:
Peter Johnson
2023-02-17 16:48:34 -08:00
committed by GitHub
parent 25ab9cda92
commit ba37986561
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ntcore/src/main/native/cpp/NetworkClient.cpp
View File

@@ -328,7 +328,7 @@ void NCImpl3::TcpConnected(uv::Tcp& tcp) {
tcp.closed.connect([this, &tcp] {
DEBUG3("NT3 TCP connection closed");
if (!tcp.IsLoopClosing()) {
Disconnect(m_wire->GetDisconnectReason());
Disconnect(m_wire ? m_wire->GetDisconnectReason() : "unknown");
}
});
@@ -492,7 +492,10 @@ void NCImpl4::WsConnected(wpi::WebSocket& ws, uv::Tcp& tcp) {
}
void NCImpl4::Disconnect(std::string_view reason) {
auto realReason = m_wire->GetDisconnectReason();
std::string realReason;
if (m_wire) {
realReason = m_wire->GetDisconnectReason();
}
INFO("DISCONNECTED NT4 connection: {}",
realReason.empty() ? reason : realReason);
m_clientImpl.reset();