From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 15 Apr 2004 22:56:26 +0000 (+0000)
Subject: fixed WaitOnConnect() in non GUI mode (patch 905185)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f6a9c0257704e3402b1228c2d0f368ae47769c7b

fixed WaitOnConnect() in non GUI mode (patch 905185)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/msw/gsocket.c b/src/msw/gsocket.c
index 20c11ad591..50121a0900 100644
--- a/src/msw/gsocket.c
+++ b/src/msw/gsocket.c
@@ -780,7 +780,7 @@ GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
     FD_ZERO(&writefds);
     FD_ZERO(&exceptfds);
     FD_SET(socket->m_fd, &readfds);
-	if (flags & GSOCK_OUTPUT_FLAG)
+	if (flags & GSOCK_OUTPUT_FLAG || flags & GSOCK_CONNECTION_FLAG)
       FD_SET(socket->m_fd, &writefds);
     FD_SET(socket->m_fd, &exceptfds);
 
diff --git a/src/unix/gsocket.c b/src/unix/gsocket.c
index 16eae12743..eae3b541aa 100644
--- a/src/unix/gsocket.c
+++ b/src/unix/gsocket.c
@@ -913,17 +913,17 @@ GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
     fd_set exceptfds;
     struct timeval tv;
 
+    assert(socket != NULL);
+
     /* Do not use a static struct, Linux can garble it */
     tv.tv_sec = socket->m_timeout / 1000;
     tv.tv_usec = (socket->m_timeout % 1000) / 1000;
 
-    assert(socket != NULL);
-
     FD_ZERO(&readfds);
     FD_ZERO(&writefds);
     FD_ZERO(&exceptfds);
     FD_SET(socket->m_fd, &readfds);
-    if (flags & GSOCK_OUTPUT_FLAG)
+    if (flags & GSOCK_OUTPUT_FLAG || flags & GSOCK_CONNECTION_FLAG)
       FD_SET(socket->m_fd, &writefds);
     FD_SET(socket->m_fd, &exceptfds);