cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-30 00:22:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #87 from Cyberboss/rcfix

Browse Source 
Some Interop Listener fixes
This commit is contained in:
Jordan Brown
2017-06-30 16:12:04 -04:00
committed by GitHub
parent f2a9c1184c f18e7bbdb0
commit 6aa36f6453
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TGServerService/Config.cs
+4 -1
View File
@@ -407,7 +407,10 @@ namespace TGServerService
try
{
error = null;
return Convert.ToUInt16(File.ReadAllText(InteropConfig));
lock (configLock)
{
return Convert.ToUInt16(File.ReadAllText(InteropConfig));
}
}
catch (Exception e)
{
TGServerService/Interop.cs
+10 -9
View File
@@ -221,16 +221,17 @@ namespace TGServerService
{
try
{
var handler = listener.EndAccept(asyncResult);
using (var handler = listener.EndAccept(asyncResult))
{
var bytes = new byte[1024];
int bytesRec = handler.Receive(bytes);
// Show the data on the console.
HandleCommand(Encoding.ASCII.GetString(bytes, 0, bytesRec));
handler.Shutdown(SocketShutdown.Both);
handler.Close();
clientConnected.Set();
var bytes = new byte[1024];
int bytesRec = handler.Receive(bytes);
// Show the data on the console.
HandleCommand(Encoding.ASCII.GetString(bytes, 0, bytesRec));
handler.Close();
clientConnected.Set();
}
}
catch (ObjectDisposedException)
{ }