From 7adacc047797f77dc1e5655e5b9e4ad2cfe3461a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 1 Nov 2014 07:43:12 +0100 Subject: [PATCH] StyleCop clean Connection --- OpenRA.Game/Network/Connection.cs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/OpenRA.Game/Network/Connection.cs b/OpenRA.Game/Network/Connection.cs index 46486216d5..f00680f936 100755 --- a/OpenRA.Game/Network/Connection.cs +++ b/OpenRA.Game/Network/Connection.cs @@ -43,6 +43,7 @@ namespace OpenRA.Network public int FromClient; public byte[] Data; } + protected List receivedPackets = new List(); public virtual int LocalClientId @@ -120,7 +121,7 @@ namespace OpenRA.Network public NetworkConnection(string host, int port) { - t = new Thread( _ => + t = new Thread(_ => { try { @@ -145,7 +146,7 @@ namespace OpenRA.Network if (len == 0) throw new NotImplementedException(); lock (this) - receivedPackets.Add(new ReceivedPacket { FromClient = client, Data = buf } ); + receivedPackets.Add(new ReceivedPacket { FromClient = client, Data = buf }); } } catch { } @@ -155,8 +156,7 @@ namespace OpenRA.Network if (socket != null) socket.Close(); } - } - ) { IsBackground = true }; + }) { IsBackground = true }; t.Start(); } @@ -182,12 +182,14 @@ namespace OpenRA.Network var ms = new MemoryStream(); ms.Write(BitConverter.GetBytes((int)packet.Length)); ms.Write(packet); + foreach (var q in queuedSyncPackets) { ms.Write(BitConverter.GetBytes((int)q.Length)); ms.Write(q); base.Send(q); } + queuedSyncPackets.Clear(); ms.WriteTo(socket.GetStream()); } @@ -209,11 +211,13 @@ namespace OpenRA.Network if (disposing) if (socket != null) socket.Client.Close(); + using (new PerfSample("Thread.Join")) { if (!t.Join(1000)) return; } + base.Dispose(disposing); }