From bc528cd870e52c75787137e06568343de1029155 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Sun, 7 Aug 2022 11:51:52 -0700
Subject: [PATCH] Ensure extended underline style is cleared on SGR 24

---
 src/common/InputHandler.ts         | 1 +
 src/common/buffer/AttributeData.ts | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/common/InputHandler.ts b/src/common/InputHandler.ts
index 34c99f84..5a0725a4 100644
--- a/src/common/InputHandler.ts
+++ b/src/common/InputHandler.ts
@@ -2500,6 +2500,7 @@ export class InputHandler extends Disposable implements IInputHandler {
       } else if (p === 24) {
         // not underlined
         attr.fg &= ~FgFlags.UNDERLINE;
+        this._processUnderline(UnderlineStyle.NONE, attr);
       } else if (p === 25) {
         // not blink
         attr.fg &= ~FgFlags.BLINK;
diff --git a/src/common/buffer/AttributeData.ts b/src/common/buffer/AttributeData.ts
index e4f464cd..3af3d293 100644
--- a/src/common/buffer/AttributeData.ts
+++ b/src/common/buffer/AttributeData.ts
@@ -36,7 +36,7 @@ export class AttributeData implements IAttributeData {
   public isInverse(): number       { return this.fg & FgFlags.INVERSE; }
   public isBold(): number          { return this.fg & FgFlags.BOLD; }
   public isUnderline(): number     {
-    if (this.hasExtendedAttrs() && this.extended.urlId) {
+    if (this.hasExtendedAttrs() && this.extended.underlineStyle !== UnderlineStyle.NONE) {
       return 1;
     }
     return this.fg & FgFlags.UNDERLINE;