Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #59582 from Faless/net/4.x_tcp_explicit_poll

Browse source
This commit is contained in:
Rémi Verschelde 2022-04-27 13:56:58 +02:00 • committed by GitHub
commit 6e6fe2b025
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 51 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/websocket/wsl_client.cpp
View file

@ -273,6 +273,7 @@ void WSLClient::poll() {
return; // Not connected.
}
_tcp->poll();
switch (_tcp->get_status()) {
case StreamPeerTCP::STATUS_NONE:
// Clean close
@ -336,7 +337,7 @@ MultiplayerPeer::ConnectionStatus WSLClient::get_connection_status() const {
return CONNECTION_CONNECTED;
}
if (_tcp->is_connected_to_host() || _resolver_id != IP::RESOLVER_INVALID_ID) {
if (_tcp->get_status() == StreamPeerTCP::STATUS_CONNECTING || _resolver_id != IP::RESOLVER_INVALID_ID) {
return CONNECTION_CONNECTING;
}