From 03b729e318e094d3ac236a3a66e243bd80f0c825 Mon Sep 17 00:00:00 2001 From: Taylor Richards Date: Mon, 10 Jun 2024 20:17:16 -0400 Subject: [PATCH 1/2] fix PXO chat lobby connection failure on Linux/Mac --- netcon/mtclient/chat_api.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netcon/mtclient/chat_api.cpp b/netcon/mtclient/chat_api.cpp index 59b65a6f5..390243bc1 100644 --- a/netcon/mtclient/chat_api.cpp +++ b/netcon/mtclient/chat_api.cpp @@ -205,7 +205,7 @@ int ConnectToChatServer(const char *serveraddr, int16_t chat_port, char *nicknam #ifndef __LINUX__ if (WSAEWOULDBLOCK == WSAGetLastError()) #else - if (WSAEWOULDBLOCK == ret || 0 == ret) + if (WSAEWOULDBLOCK == ret || EINPROGRESS == ret || 0 == ret) #endif { DLLmprintf(0, "Beginning socket connect\n"); From ed0ff23cee1c0c0a38f57dd69e8af152dfae5ea5 Mon Sep 17 00:00:00 2001 From: Taylor Richards Date: Tue, 11 Jun 2024 14:58:45 -0400 Subject: [PATCH 2/2] remove unnecessary return value test --- netcon/mtclient/chat_api.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netcon/mtclient/chat_api.cpp b/netcon/mtclient/chat_api.cpp index 390243bc1..3808c792e 100644 --- a/netcon/mtclient/chat_api.cpp +++ b/netcon/mtclient/chat_api.cpp @@ -205,7 +205,7 @@ int ConnectToChatServer(const char *serveraddr, int16_t chat_port, char *nicknam #ifndef __LINUX__ if (WSAEWOULDBLOCK == WSAGetLastError()) #else - if (WSAEWOULDBLOCK == ret || EINPROGRESS == ret || 0 == ret) + if (EINPROGRESS == ret || 0 == ret) #endif { DLLmprintf(0, "Beginning socket connect\n");