diff options
-rw-r--r-- | stream/tcp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/stream/tcp.c b/stream/tcp.c index bf5f06c820..def97a4564 100644 --- a/stream/tcp.c +++ b/stream/tcp.c @@ -195,9 +195,7 @@ connect2Server_with_af(char *host, int port, int af,int verb) { FD_SET( socket_server_fd, &set ); // When the connection will be made, we will have a writeable fd while((ret = select(socket_server_fd+1, NULL, &set, NULL, &tv)) == 0) { - if( ret<0 ) mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_NW_SelectFailed); - else if(ret > 0) break; - else if(count > 30 || mp_input_check_interrupt(500)) { + if(count > 30 || mp_input_check_interrupt(500)) { if(count > 30) mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_NW_ConnTimeout); else @@ -210,6 +208,7 @@ connect2Server_with_af(char *host, int port, int af,int verb) { tv.tv_sec = 0; tv.tv_usec = 500000; } + if (ret < 0) mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_NW_SelectFailed); // Turn back the socket as blocking #ifndef HAVE_WINSOCK2 |