From 1b64a09f50bcc1edda5dc16e2ff7fcd3de7602d5 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Sat, 27 Aug 2022 21:35:56 -0700
Subject: [PATCH] Correct conditions after moving to work object

---
 addons/xterm-addon-webgl/src/WebglRenderer.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/xterm-addon-webgl/src/WebglRenderer.ts b/addons/xterm-addon-webgl/src/WebglRenderer.ts
index efb80f66..ea10b368 100644
--- a/addons/xterm-addon-webgl/src/WebglRenderer.ts
+++ b/addons/xterm-addon-webgl/src/WebglRenderer.ts
@@ -475,27 +475,29 @@ export class WebglRenderer extends Disposable implements IRenderer {
     // Handle case where inverse was specified by only one of bg override or fg override was set,
     // resolving the other inverse color and setting the inverse flag if needed.
     if (this._workColors.fg & FgFlags.INVERSE) {
-      if (w.hasBg && w.hasFg) {
+      if (w.hasBg && !w.hasFg) {
         // Resolve bg color type (default color has a different meaning in fg vs bg)
         if ((this._workColors.bg & Attributes.CM_MASK) === Attributes.CM_DEFAULT) {
           w.fg = (this._workColors.fg & ~(Attributes.RGB_MASK | FgFlags.INVERSE | Attributes.CM_MASK)) | ((this._colors.background.rgba >> 8 & 0xFFFFFF) & Attributes.RGB_MASK) | Attributes.CM_RGB;
         } else {
           w.fg = (this._workColors.fg & ~(Attributes.RGB_MASK | FgFlags.INVERSE | Attributes.CM_MASK)) | this._workColors.bg & (Attributes.RGB_MASK | Attributes.CM_MASK);
         }
+        w.hasFg = true;
       }
-      if (w.hasBg && w.hasFg) {
+      if (!w.hasBg && w.hasFg) {
         // Resolve bg color type (default color has a different meaning in fg vs bg)
         if ((this._workColors.fg & Attributes.CM_MASK) === Attributes.CM_DEFAULT) {
           w.bg = (this._workColors.bg & ~(Attributes.RGB_MASK | Attributes.CM_MASK)) | ((this._colors.foreground.rgba >> 8 & 0xFFFFFF) & Attributes.RGB_MASK) | Attributes.CM_RGB;
         } else {
           w.bg = (this._workColors.bg & ~(Attributes.RGB_MASK | Attributes.CM_MASK)) | this._workColors.fg & (Attributes.RGB_MASK | Attributes.CM_MASK);
         }
+        w.hasBg = true;
       }
     }
 
     // Use the override if it exists
-    this._workColors.bg = w.bg ?? this._workColors.bg;
-    this._workColors.fg = w.fg ?? this._workColors.fg;
+    this._workColors.bg = w.hasBg ? w.bg : this._workColors.bg;
+    this._workColors.fg = w.hasFg ? w.fg : this._workColors.fg;
   }
 
   private _isCellSelected(x: number, y: number): boolean {