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 20c11ad5913f15ba5986a4f701bad9cc905a16fe..50121a09001fbcb889a87dbe02981e9157588216 100644 (file)
--- 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);
     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);
 
       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 16eae12743e6e4810bb1337bb8b35adefd85bd7c..eae3b541aa3d404efccc3f04d591ff4335c5dada 100644 (file)
--- 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;
 
     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;
 
     /* 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);
     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);
 
       FD_SET(socket->m_fd, &writefds);
     FD_SET(socket->m_fd, &exceptfds);