From 65ccfccfc1e35a2e65638aea61c46e4e51bd874e Mon Sep 17 00:00:00 2001
From: Björn Steinbrink <B.Steinbrink@gmx.de>
Date: Wed, 15 Mar 2006 22:47:21 +0000
Subject: Fixed connection not being shut down completely in case of an error.

---
 src/net/network.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/net')

diff --git a/src/net/network.cpp b/src/net/network.cpp
index 366d07d9..bd0e2444 100644
--- a/src/net/network.cpp
+++ b/src/net/network.cpp
@@ -91,6 +91,7 @@ int networkThread(void *data)
 }
 
 Network::Network():
+    mSocket(0),
     mAddress(), mPort(0),
     mInBuffer(new char[BUFFER_SIZE]),
     mOutBuffer(new char[BUFFER_SIZE]),
@@ -154,9 +155,6 @@ bool Network::connect(const std::string &address, short port)
 
 void Network::disconnect()
 {
-    if (mState != CONNECTED && mState != CONNECTING)
-        return;
-
     mState = IDLE;
 
     if (mWorkerThread)
@@ -164,7 +162,12 @@ void Network::disconnect()
         SDL_WaitThread(mWorkerThread, NULL);
         mWorkerThread = NULL;
     }
-    SDLNet_TCP_Close(mSocket);
+
+    if (mSocket)
+    {
+        SDLNet_TCP_Close(mSocket);
+        mSocket = 0;
+    }
 }
 
 void Network::registerHandler(MessageHandler *handler)
-- 
cgit v1.2.3-70-g09d2