raidboss: fix errors on delayed triggers being cancelled (#5912)

Fixes #5153.
quisquous · Nov 9, 2023 · 9f32885 · 9f32885
1 parent 2cc271d
commit 9f32885
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/ui/raidboss/popup-text.ts b/ui/raidboss/popup-text.ts
@@ -553,7 +553,8 @@ const isWipe = (line: string): boolean => {
 export class PopupText {
   protected triggers: ProcessedTrigger[] = [];
   protected netTriggers: ProcessedTrigger[] = [];
-  protected timers: { [triggerId: number]: boolean } = {};
+  // A map of trigger id to setTimeout handle.
+  protected timers: { [triggerId: number]: number } = {};
   protected triggerSuppress: { [triggerId: string]: number } = {};
   protected currentTriggerID = 0;
   protected inCombat = false;
@@ -1048,6 +1049,8 @@ export class PopupText {
   }
 
   StopTimers(): void {
+    for (const handle of Object.values(this.timers))
+      window.clearTimeout(handle);
     this.timers = {};
   }
 
@@ -1334,9 +1337,8 @@ export class PopupText {
       return;
 
     const triggerID = this.currentTriggerID++;
-    this.timers[triggerID] = true;
     return new Promise((res, rej) => {
-      window.setTimeout(() => {
+      this.timers[triggerID] = window.setTimeout(() => {
         if (this.timers[triggerID])
           res();
         else