Merge branch 'rc-v3.0.2' into rc-v3.1.0

This is a periodic merge to keep 3.1.0 up to date with 3.0.2
This commit is contained in:
Lion Kortlepel
2022-03-31 22:10:49 +02:00
10 changed files with 154 additions and 54 deletions

View File

@@ -522,6 +522,7 @@ void TNetwork::Looper(const std::weak_ptr<TClient>& c) {
}
}
}
void TNetwork::TCPClient(const std::weak_ptr<TClient>& c) {
// TODO: the c.expired() might cause issues here, remove if you end up here with your debugger
if (c.expired() || c.lock()->GetTCPSock() == -1) {