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

Don't crash on voice buffer clear

Browse Source
This commit is contained in:
RogueException
2015-10-18 16:50:06 -03:00
parent 6921694616
commit 6e9d6a9b6c
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Discord.Net/WebSockets/Voice/VoiceBuffer.cs
View File

@@ -46,7 +46,11 @@ namespace Discord.WebSockets.Voice
if (_readCursor == nextPosition)
{
_notOverflowEvent.Reset();
_notOverflowEvent.Wait(cancelToken);
try
{
_notOverflowEvent.Wait(cancelToken);
}
catch (OperationCanceledException) { return; }
}
if (i == wholeFrames)
@@ -100,7 +104,11 @@ namespace Discord.WebSockets.Voice
_isClearing = true;
for (int i = 0; i < _frameCount; i++)
Buffer.BlockCopy(_blankFrame, 0, _buffer, i * _frameCount, i++);
_underflowEvent.Wait(cancelToken);
try
{
_underflowEvent.Wait(cancelToken);
}
catch (OperationCanceledException) { }
_writeCursor = 0;
_readCursor = 0;
_isClearing = false;