aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@exmulti.com>2011-06-09 22:42:25 -0700
committerJeff Garzik <jgarzik@exmulti.com>2011-06-09 22:42:25 -0700
commit65ee333ae0f5ee3cbaf0bc0e60112bae4ea538c0 (patch)
tree4d106b4794f8a97003f44e8608c1fc43c4b0b671 /src
parent2661f2f7c45a28322e1ab4c2514ecfe82ec496b4 (diff)
parentc6710c7a70658536ab0217dff18a45622ea08680 (diff)
Merge pull request #304 from TheBlueMatt/cpufix
Fix CPU Usage bug when using -nolisten and have no connections.
Diffstat (limited to 'src')
-rw-r--r--src/net.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/net.cpp b/src/net.cpp
index 39360a334c..c884e8d5e7 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -756,9 +756,12 @@ void ThreadSocketHandler2(void* parg)
if (nSelect == SOCKET_ERROR)
{
int nErr = WSAGetLastError();
- printf("socket select error %d\n", nErr);
- for (int i = 0; i <= hSocketMax; i++)
- FD_SET(i, &fdsetRecv);
+ if (hSocketMax > -1)
+ {
+ printf("socket select error %d\n", nErr);
+ for (int i = 0; i <= hSocketMax; i++)
+ FD_SET(i, &fdsetRecv);
+ }
FD_ZERO(&fdsetSend);
FD_ZERO(&fdsetError);
Sleep(timeout.tv_usec/1000);