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

Fixed Block()

Browse Source
This commit is contained in:
RogueException
2015-09-08 22:32:43 -03:00
parent 489ad42235
commit b7c54dbda5
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Discord.Net/DiscordClient.cs
View File

@@ -23,7 +23,7 @@ namespace Discord
private readonly JsonSerializer _serializer; private readonly JsonSerializer _serializer;
private readonly Regex _userRegex, _channelRegex; private readonly Regex _userRegex, _channelRegex;
private readonly MatchEvaluator _userRegexEvaluator, _channelRegexEvaluator; private readonly MatchEvaluator _userRegexEvaluator, _channelRegexEvaluator;
private readonly object _disconnectEvent; private readonly ManualResetEvent _disconnectEvent;
private readonly Random _rand; private readonly Random _rand;
private readonly ConcurrentQueue<Message> _pendingMessages; private readonly ConcurrentQueue<Message> _pendingMessages;
private readonly DiscordClientConfig _config; private readonly DiscordClientConfig _config;
@@ -56,7 +56,7 @@ namespace Discord
/// <summary> Initializes a new instance of the DiscordClient class. </summary> /// <summary> Initializes a new instance of the DiscordClient class. </summary>
public DiscordClient(DiscordClientConfig config = null) public DiscordClient(DiscordClientConfig config = null)
{ {
_disconnectEvent = new object(); _disconnectEvent = new ManualResetEvent(true);
_config = config ?? new DiscordClientConfig(); _config = config ?? new DiscordClientConfig();
_isDebugMode = _config.EnableDebug; _isDebugMode = _config.EnableDebug;
_rand = new Random(); _rand = new Random();
@@ -545,6 +545,7 @@ namespace Discord
private async Task Run() private async Task Run()
{ {
_disconnectEvent.Reset();
_disconnectToken = new CancellationTokenSource(); _disconnectToken = new CancellationTokenSource();
//Run Loops //Run Loops
@@ -562,7 +563,7 @@ namespace Discord
//TODO: What happens if a reconnect occurs and caches havent been cleared yet? Compare to DiscordWebSocket.Cleanup() //TODO: What happens if a reconnect occurs and caches havent been cleared yet? Compare to DiscordWebSocket.Cleanup()
private async Task Cleanup() private async Task Cleanup()
{ {
_isDisconnecting = true; _disconnectEvent.Set();
await _webSocket.DisconnectAsync().ConfigureAwait(false); await _webSocket.DisconnectAsync().ConfigureAwait(false);
#if !DNXCORE50 #if !DNXCORE50
@@ -582,7 +583,6 @@ namespace Discord
_runTask = null; _runTask = null;
_isConnected = false; _isConnected = false;
_isDisconnecting = false; _isDisconnecting = false;
Monitor.Pulse(_disconnectEvent);
} }
//Voice //Voice
@@ -685,8 +685,8 @@ namespace Discord
/// <summary> Blocking call that will not return until client has been stopped. This is mainly intended for use in console applications. </summary> /// <summary> Blocking call that will not return until client has been stopped. This is mainly intended for use in console applications. </summary>
public void Block() public void Block()
{ {
while (_isConnected) if (_isConnected)
Monitor.Wait(_disconnectEvent, TimeSpan.FromSeconds(3)); _disconnectEvent.WaitOne();
} }
} }
} }