github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stop generating AggregateExceptions

Browse Source
This commit is contained in:
RogueException
2016-01-02 13:24:30 -04:00
parent 85a891762d
commit e1ac8112e3
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Discord.Net/Net/WebSockets/GatewaySocket.cs
View File

@@ -86,7 +86,7 @@ namespace Discord.Net.WebSockets
protected override async Task ProcessMessage(string json) protected override async Task ProcessMessage(string json)
{ {
base.ProcessMessage(json).Wait(); //This is just a CompletedTask, and we need to avoid asyncs in here base.ProcessMessage(json).GetAwaiter().GetResult(); //This is just a CompletedTask, and we need to avoid asyncs in here
var msg = JsonConvert.DeserializeObject<WebSocketMessage>(json); var msg = JsonConvert.DeserializeObject<WebSocketMessage>(json);
if (msg.Sequence.HasValue) if (msg.Sequence.HasValue)
_lastSequence = msg.Sequence.Value; _lastSequence = msg.Sequence.Value;

2
src/Discord.Net/Net/WebSockets/WebSocket.cs
View File

@@ -65,7 +65,7 @@ namespace Discord.Net.WebSockets
zlib.CopyTo(decompressed); zlib.CopyTo(decompressed);
decompressed.Position = 0; decompressed.Position = 0;
using (var reader = new StreamReader(decompressed)) using (var reader = new StreamReader(decompressed))
ProcessMessage(reader.ReadToEnd()).Wait(); ProcessMessage(reader.ReadToEnd()).GetAwaiter().GetResult();
} }
}; };
_engine.TextMessage += (s, e) => ProcessMessage(e.Message).Wait(); _engine.TextMessage += (s, e) => ProcessMessage(e.Message).Wait();