mattburchett/NadekoBot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Master Kwoth 2017-07-28 12:38:08 +02:00
parent d5978a0d66
commit f06ee47516
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/NadekoBot/Modules/Games/Common/Hangman/Hangman.cs
View File

@ -53,6 +53,7 @@ namespace NadekoBot.Modules.Games.Common.Hangman
public ImmutableArray<char> PreviousGuesses => _previousGuesses.ToImmutableArray(); public ImmutableArray<char> PreviousGuesses => _previousGuesses.ToImmutableArray();
private readonly TaskCompletionSource<bool> _endingCompletionSource = new TaskCompletionSource<bool>(); private readonly TaskCompletionSource<bool> _endingCompletionSource = new TaskCompletionSource<bool>();
private bool disposed = false;
public Task EndedTask => _endingCompletionSource.Task; public Task EndedTask => _endingCompletionSource.Task;

1
src/NadekoBot/Modules/Games/Common/Hangman/TermPool.cs
View File

@ -1,5 +1,4 @@
using NadekoBot.Common; using NadekoBot.Common;
using NadekoBot.Extensions;
using NadekoBot.Modules.Games.Common.Hangman.Exceptions; using NadekoBot.Modules.Games.Common.Hangman.Exceptions;
using Newtonsoft.Json; using Newtonsoft.Json;
using System; using System;

7
src/NadekoBot/Modules/Games/HangmanCommands.cs
View File

@ -60,6 +60,9 @@ namespace NadekoBot.Modules.Games
await hm.EndedTask.ConfigureAwait(false); await hm.EndedTask.ConfigureAwait(false);
_client.MessageReceived -= _client_MessageReceived;
HangmanGames.TryRemove(Context.Channel.Id, out _);
hm.Dispose();
Task _client_MessageReceived(SocketMessage msg) Task _client_MessageReceived(SocketMessage msg)
{ {
@ -76,8 +79,6 @@ namespace NadekoBot.Modules.Games
Task Hm_OnGameEnded(Hangman game, string winner) Task Hm_OnGameEnded(Hangman game, string winner)
{ {
HangmanGames.TryRemove(Context.Channel.Id, out _);
if (winner == null) if (winner == null)
{ {
var loseEmbed = new EmbedBuilder().WithTitle($"Hangman Game ({game.TermType}) - Ended") var loseEmbed = new EmbedBuilder().WithTitle($"Hangman Game ({game.TermType}) - Ended")
@ -127,7 +128,7 @@ namespace NadekoBot.Modules.Games
{ {
if (HangmanGames.TryRemove(Context.Channel.Id, out var removed)) if (HangmanGames.TryRemove(Context.Channel.Id, out var removed))
{ {
removed.Dispose(); await removed.Stop().ConfigureAwait(false);
await ReplyConfirmLocalized("hangman_stopped").ConfigureAwait(false); await ReplyConfirmLocalized("hangman_stopped").ConfigureAwait(false);
} }
} }