Fix decoration lifecycle issues

xtermjs · Mar 21, 2022 · 43a014e · 43a014e
1 parent b39477d
commit 43a014e
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/common/services/DecorationService.ts b/src/common/services/DecorationService.ts
@@ -32,7 +32,10 @@ export class DecorationService extends Disposable implements IDecorationService
     if (decoration) {
       decoration.onDispose(() => {
         if (decoration) {
-          this._decorations.splice(this._decorations.indexOf(decoration), 1);
+          const index = this._decorations.indexOf(decoration);
+          if (index >= 0) {
+            this._decorations.splice(this._decorations.indexOf(decoration), 1);
+          }
         }
       });
       this._decorations.push(decoration);
@@ -70,6 +73,10 @@ class Decoration extends Disposable implements IInternalDecoration {
     }
   }
   public override dispose(): void {
+    if (this._isDisposed) {
+      return;
+    }
+    this._isDisposed = true;
     this._onDispose.fire();
     super.dispose();
   }