diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-06-14 18:13:46 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-06-14 18:13:46 +0000 |
| commit | 6ec9d30905e8df77e60d0195074920271abb977a (patch) | |
| tree | 59b21a9be7282b5ee3a2dc6c0b4f2d5a31882904 /src/net.cpp | |
| parent | 722ff53718333dc290760d528b7a561d29ab41a8 (diff) | |
| parent | 3703150d56ff6ee557ab330e55637c9c23835902 (diff) | |
| download | bitcoin-6ec9d30905e8df77e60d0195074920271abb977a.tar.xz | |
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
src/main.h
src/net.cpp
src/serialize.h
Diffstat (limited to 'src/net.cpp')
| -rw-r--r-- | src/net.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/net.cpp b/src/net.cpp index 6707d790e2..d927c505e0 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -693,7 +693,7 @@ void ThreadSocketHandler2(void* parg) if (nSelect == SOCKET_ERROR) { int nErr = WSAGetLastError(); - if (hSocketMax > -1) + if (hSocketMax != INVALID_SOCKET) { printf("socket select error %d\n", nErr); for (unsigned int i = 0; i <= hSocketMax; i++) @@ -1535,7 +1535,7 @@ void ThreadMessageHandler2(void* parg) vnThreadsRunning[THREAD_MESSAGEHANDLER]--; Sleep(100); if (fRequestShutdown) - Shutdown(NULL); + StartShutdown(); vnThreadsRunning[THREAD_MESSAGEHANDLER]++; if (fShutdown) return; |