From 2254e48f65d0ac01db6cdc0340e69d5647ecb088 Mon Sep 17 00:00:00 2001
From: alzeih <alzeih@gmail.com>
Date: Sat, 24 Jul 2010 19:13:34 +1200
Subject: [PATCH] little bit better threading [pchote: picked/amended]

---
 OpenRA.Game/Network/Connection.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/OpenRA.Game/Network/Connection.cs b/OpenRA.Game/Network/Connection.cs
index f47f1d6d44..7670918a51 100755
--- a/OpenRA.Game/Network/Connection.cs
+++ b/OpenRA.Game/Network/Connection.cs
@@ -115,6 +115,8 @@ namespace OpenRA.Network
 				{
 					connectionState = ConnectionState.NotConnected;
 				}
+				catch ( IOException ) { socket.Close(); }
+				catch (ThreadAbortException ) { socket.Close(); }
 			}
 			) { IsBackground = true };
 			t.Start();
@@ -145,8 +147,8 @@ namespace OpenRA.Network
 			disposed = true;
 			GC.SuppressFinalize( this );
 
-			socket.Close();
 			t.Abort();
+			t.Join();
 		}
 		
 		~NetworkConnection() { Dispose(); }