godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: Return if TCP is in STATUS_CONNECTED 

If the `StreamPeerTCP` is polled and the TCP connection is `STATUS_CONNECTED` it should return after polling netsocket. Without `return` poll keeps calling `_sock->connect_to_host` and `connect()`.

(cherry picked from commit 61a2f5c534)
This commit is contained in:
Yorick de Wid 2024-04-16 10:32:11 +02:00 committed by Rémi Verschelde
parent bb5ea0d249
commit 943b394946
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -217,6 +217,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Fix NavigationObstacle elevation ([GH-84830](https://github.com/godotengine/godot/pull/84830)). - Fix NavigationObstacle elevation ([GH-84830](https://github.com/godotengine/godot/pull/84830)).
- Fix NavigationObstacle height ([GH-84857](https://github.com/godotengine/godot/pull/84857)). - Fix NavigationObstacle height ([GH-84857](https://github.com/godotengine/godot/pull/84857)).
#### Networking
- Fix missing return in `StreamPeerTCP::poll` when connection is `STATUS_CONNECTED` ([GH-90741](https://github.com/godotengine/godot/pull/90741)).
#### Particles #### Particles
- Fix several Material texture parameter updates ([GH-84303](https://github.com/godotengine/godot/pull/84303)). - Fix several Material texture parameter updates ([GH-84303](https://github.com/godotengine/godot/pull/84303)).

1
core/io/stream_peer_tcp.cpp
View File

@ -51,6 +51,7 @@ Error StreamPeerTCP::poll() {
status = STATUS_ERROR; status = STATUS_ERROR;
return err; return err;
} }
return OK;
} else if (status != STATUS_CONNECTING) { } else if (status != STATUS_CONNECTING) {
return OK; return OK;
} }