Max concurrency things in Command.prepare()

Cog-Creators · Jan 13, 2021 · d91ff8f · d91ff8f
1 parent 679c995
commit d91ff8f
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/redbot/core/commands/commands.py b/redbot/core/commands/commands.py
@@ -485,15 +485,22 @@ async def prepare(self, ctx):
         if not await self.can_run(ctx, change_permission_state=True):
             raise CheckFailure(f"The check functions for command {self.qualified_name} failed.")
 
-        if self.cooldown_after_parsing:
-            await self._parse_arguments(ctx)
-            self._prepare_cooldowns(ctx)
-        else:
-            self._prepare_cooldowns(ctx)
-            await self._parse_arguments(ctx)
         if self._max_concurrency is not None:
             await self._max_concurrency.acquire(ctx)
-        await self.call_before_hooks(ctx)
+
+        try:
+            if self.cooldown_after_parsing:
+                await self._parse_arguments(ctx)
+                self._prepare_cooldowns(ctx)
+            else:
+                self._prepare_cooldowns(ctx)
+                await self._parse_arguments(ctx)
+
+            await self.call_before_hooks(ctx)
+        except:
+            if self._max_concurrency is not None:
+                await self._max_concurrency.release(ctx)
+            raise
 
     async def do_conversion(
         self, ctx: "Context", converter, argument: str, param: inspect.Parameter