sem/Csharp-eindproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/jsonForWords' into fix-async-stuff

Browse Source
This commit is contained in:
Sem van der Hoeven
2020-10-22 16:37:05 +02:00
parent bb289865b7 d8bbaf5258
commit 07b0357b0a
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Client/Client.cs
View File

@@ -76,6 +76,7 @@ namespace Client
expectedMessageLength = BitConverter.ToInt32(totalBuffer, 0); expectedMessageLength = BitConverter.ToInt32(totalBuffer, 0);
} }
ar.AsyncWaitHandle.WaitOne();
stream.BeginRead(buffer, 0, buffer.Length, new AsyncCallback(OnReadComplete), null); stream.BeginRead(buffer, 0, buffer.Length, new AsyncCallback(OnReadComplete), null);
} }

5
Server/Models/ServerClient.cs
View File

@@ -90,9 +90,9 @@ namespace Server.Models
} }
ar.AsyncWaitHandle.WaitOne();
// start reading for a new message // start reading for a new message
stream.BeginRead(buffer, 0, buffer.Length, new AsyncCallback(OnRead), null); stream.BeginRead(buffer, 0, buffer.Length, new AsyncCallback(OnRead), null);
} }
catch (IOException e) catch (IOException e)
{ {
@@ -192,7 +192,7 @@ namespace Server.Models
sendMessage(JSONConvert.ConstructLobbyJoinSuccessMessage()); sendMessage(JSONConvert.ConstructLobbyJoinSuccessMessage());
ServerCommunication.INSTANCE.sendToAll(JSONConvert.ConstructLobbyListMessage(ServerCommunication.INSTANCE.lobbies.ToArray())); ServerCommunication.INSTANCE.sendToAll(JSONConvert.ConstructLobbyListMessage(ServerCommunication.INSTANCE.lobbies.ToArray()));
Task.Run(SendLobbyData); //Task.Run(SendLobbyData);
serverCom.sendToAll(JSONConvert.GetMessageToSend(JSONConvert.RANDOMWORD, new serverCom.sendToAll(JSONConvert.GetMessageToSend(JSONConvert.RANDOMWORD, new
{ {
@@ -214,6 +214,7 @@ namespace Server.Models
string result = await WaitForData(); string result = await WaitForData();
if(result == "bruh momento") if(result == "bruh momento")
{ {
} }
} }