From 5be5468c347681689c5fab7b1757ab60a5740e46 Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Wed, 3 Oct 2007 04:32:10 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1339 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/serverbrowser.cpp | 1 + source/src/serverms.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/source/src/serverbrowser.cpp b/source/src/serverbrowser.cpp index facc5c5b..c3cccca7 100644 --- a/source/src/serverbrowser.cpp +++ b/source/src/serverbrowser.cpp @@ -431,6 +431,7 @@ void refreshservers(void *menu, bool init) if(pingsock == ENET_SOCKET_NULL) { pingsock = enet_socket_create(ENET_SOCKET_TYPE_DATAGRAM, NULL); + if(pingsock != ENET_SOCKET_NULL) enet_socket_set_option(pingsock, ENET_SOCKOPT_NONBLOCK, 1); resolverinit(); } resolverclear(); diff --git a/source/src/serverms.cpp b/source/src/serverms.cpp index fc5c7df9..978b8e05 100644 --- a/source/src/serverms.cpp +++ b/source/src/serverms.cpp @@ -193,6 +193,7 @@ void servermsinit(const char *master, char *ip, int infoport, char *sdesc, bool ENetAddress address = { ENET_HOST_ANY, infoport }; pongsock = enet_socket_create(ENET_SOCKET_TYPE_DATAGRAM, &address); if(pongsock == ENET_SOCKET_NULL) fatal("could not create server info socket\n"); + else enet_socket_set_option(pongsock, ENET_SOCKOPT_NONBLOCK, 1); if(*ip && enet_address_set_host(&msaddress, ip)<0) printf("WARNING: server ip not resolved"); } }