From a65ba095affcdf592d487e4cd6cf30fb0d8a5371 Mon Sep 17 00:00:00 2001 From: FiniteReality Date: Tue, 17 Jan 2017 20:08:18 +0000 Subject: [PATCH] Replace ConcurrentBag with HashSet Fixes #487 --- src/Discord.Net.Commands/CommandService.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Discord.Net.Commands/CommandService.cs b/src/Discord.Net.Commands/CommandService.cs index 0d27bd178..02a398851 100644 --- a/src/Discord.Net.Commands/CommandService.cs +++ b/src/Discord.Net.Commands/CommandService.cs @@ -18,7 +18,7 @@ namespace Discord.Commands private readonly ConcurrentDictionary> _typeReaders; private readonly ConcurrentDictionary _defaultTypeReaders; private readonly ImmutableList> _entityTypeReaders; //TODO: Candidate for C#7 Tuple - private readonly ConcurrentBag _moduleDefs; + private readonly HashSet _moduleDefs; private readonly CommandMap _map; internal readonly bool _caseSensitive; @@ -160,8 +160,7 @@ namespace Discord.Commands } private bool RemoveModuleInternal(ModuleInfo module) { - var defsRemove = module; - if (!_moduleDefs.TryTake(out defsRemove)) + if (!_moduleDefs.Remove(module)) return false; foreach (var cmd in module.Commands)