Merge pull request #8656 from Faless/fix_udp_wait

Fix UDP::wait() deadlock
2017-05-05 23:05:52 +02:00
parent d6e5215860 5c6715a291
commit a853b0a2f7
2 changed files with 4 additions and 0 deletions
--- a/drivers/unix/packet_peer_udp_posix.cpp
+++ b/drivers/unix/packet_peer_udp_posix.cpp
@@ -216,6 +216,8 @@ Error PacketPeerUDPPosix::_poll(bool p_wait) {

 		len = sizeof(struct sockaddr_storage);
 		++queue_count;
+		if (p_wait)
+			break;
 	};

 	// TODO: Should ECONNRESET be handled here?
--- a/platform/windows/packet_peer_udp_winsock.cpp
+++ b/platform/windows/packet_peer_udp_winsock.cpp
@@ -203,6 +203,8 @@ Error PacketPeerUDPWinsock::_poll(bool p_wait) {

 		len = sizeof(struct sockaddr_storage);
 		++queue_count;
+		if (p_wait)
+			break;
 	};

 	if (ret == SOCKET_ERROR) {