diff options
| author | madmaxoft <github@xoft.cz> | 2013-08-20 19:29:29 +0200 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2013-08-20 19:29:29 +0200 |
| commit | 40cb30b6a576ecdcf446377b755ed70a87b9be28 (patch) | |
| tree | 1d4ff05cc3a293ad0091fa45f1359b1a569c5fa1 | |
| parent | Started work on the cProjectileEntity class. (diff) | |
| download | cuberite-40cb30b6a576ecdcf446377b755ed70a87b9be28.tar cuberite-40cb30b6a576ecdcf446377b755ed70a87b9be28.tar.gz cuberite-40cb30b6a576ecdcf446377b755ed70a87b9be28.tar.bz2 cuberite-40cb30b6a576ecdcf446377b755ed70a87b9be28.tar.lz cuberite-40cb30b6a576ecdcf446377b755ed70a87b9be28.tar.xz cuberite-40cb30b6a576ecdcf446377b755ed70a87b9be28.tar.zst cuberite-40cb30b6a576ecdcf446377b755ed70a87b9be28.zip | |
| -rw-r--r-- | source/OSSupport/IsThread.cpp | 1 | ||||
| -rw-r--r-- | source/OSSupport/ListenThread.cpp | 2 | ||||
| -rw-r--r-- | source/OSSupport/Socket.cpp | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/source/OSSupport/IsThread.cpp b/source/OSSupport/IsThread.cpp index 45e329a68..1fadb3769 100644 --- a/source/OSSupport/IsThread.cpp +++ b/source/OSSupport/IsThread.cpp @@ -147,6 +147,7 @@ bool cIsThread::Wait(void) int res = pthread_join(m_Handle, NULL); m_Handle = NULL; LOGD("Thread %s finished", m_ThreadName.c_str()); + m_HasStarted = false; return (res == 0); #endif // else _WIN32 } diff --git a/source/OSSupport/ListenThread.cpp b/source/OSSupport/ListenThread.cpp index c586227df..0890aabc8 100644 --- a/source/OSSupport/ListenThread.cpp +++ b/source/OSSupport/ListenThread.cpp @@ -80,7 +80,7 @@ void cListenThread::Stop(void) super::Wait(); // Close all the listening sockets: - for (cSockets::iterator itr = m_Sockets.begin(), end = m_Sockets.end(); itr != end; ++itr) + for (cSockets::iterator itr = m_Sockets.begin() + 1, end = m_Sockets.end(); itr != end; ++itr) { itr->CloseSocket(); } // for itr - m_Sockets[] diff --git a/source/OSSupport/Socket.cpp b/source/OSSupport/Socket.cpp index f79bdbf47..48b5d704d 100644 --- a/source/OSSupport/Socket.cpp +++ b/source/OSSupport/Socket.cpp @@ -74,11 +74,11 @@ void cSocket::CloseSocket() if (shutdown(m_Socket, SHUT_RDWR) != 0)//SD_BOTH); { - LOGWARN("Error on shutting down socket (%s): %s", m_IPString.c_str(), GetLastErrorString().c_str()); + LOGWARN("Error on shutting down socket %d (%s): %s", m_Socket, m_IPString.c_str(), GetLastErrorString().c_str()); } if (close(m_Socket) != 0) { - LOGWARN("Error closing socket (%s): %s", m_IPString.c_str(), GetLastErrorString().c_str()); + LOGWARN("Error closing socket %d (%s): %s", m_Socket, m_IPString.c_str(), GetLastErrorString().c_str()); } #endif // else _WIN32 |