From 339bf5a24f7ca733c61363fc5ae7ec0ec5a5f5c3 Mon Sep 17 00:00:00 2001
From: itsMapleLeaf <19603573+itsMapleLeaf@users.noreply.github.com>
Date: Fri, 5 Aug 2022 09:06:47 -0500
Subject: [PATCH] slight logical corrections in renderer

---
 packages/reacord/library/renderer.ts | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/packages/reacord/library/renderer.ts b/packages/reacord/library/renderer.ts
index b4e4e07..96efe59 100644
--- a/packages/reacord/library/renderer.ts
+++ b/packages/reacord/library/renderer.ts
@@ -50,17 +50,25 @@ export class ChannelMessageRenderer implements Renderer {
     })
   }
 
-  async deactivate() {
+  deactivate() {
     return this.queue.add(async () => {
-      this.active = false
+      if (!this.active) return
+
       // TODO: disable message components
+
+      // set active to false *after* running deactivation,
+      // so that other queued operations run first,
+      // and we can show the correct deactivated state
+      this.active = false
     })
   }
 
-  async destroy() {
+  destroy() {
+    this.active = false
     return this.queue.add(async () => {
-      this.active = false
-      await this.message?.delete()
+      const message = this.message
+      this.message = undefined
+      await message?.delete()
     })
   }
 }