From d2c28c819f6127e1fdf8ea013b0e55f1638b1ccf Mon Sep 17 00:00:00 2001 From: Lewis Sanchez Date: Fri, 14 Jul 2023 11:31:59 -0700 Subject: [PATCH 1/2] Add getRasterizedGlyph null and undefined check --- addons/xterm-addon-canvas/src/BaseRenderLayer.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/addons/xterm-addon-canvas/src/BaseRenderLayer.ts b/addons/xterm-addon-canvas/src/BaseRenderLayer.ts index 1d1936e7..3bb55411 100644 --- a/addons/xterm-addon-canvas/src/BaseRenderLayer.ts +++ b/addons/xterm-addon-canvas/src/BaseRenderLayer.ts @@ -368,6 +368,11 @@ export abstract class BaseRenderLayer extends Disposable implements IRenderLayer protected _drawChars(cell: ICellData, x: number, y: number): void { const chars = cell.getChars(); this._cellColorResolver.resolve(cell, x, this._bufferService.buffer.ydisp + y); + + if (this._charAtlas === undefined || this._charAtlas === null) { + return; + } + let glyph: IRasterizedGlyph; if (chars && chars.length > 1) { glyph = this._charAtlas.getRasterizedGlyphCombinedChar(chars, this._cellColorResolver.result.bg, this._cellColorResolver.result.fg, this._cellColorResolver.result.ext); From 78aad113a65b34d335e7a1b40b672dc351c2ee30 Mon Sep 17 00:00:00 2001 From: Lewis Sanchez Date: Fri, 14 Jul 2023 15:07:38 -0700 Subject: [PATCH 2/2] Minor clean up --- addons/xterm-addon-canvas/src/BaseRenderLayer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/xterm-addon-canvas/src/BaseRenderLayer.ts b/addons/xterm-addon-canvas/src/BaseRenderLayer.ts index 3bb55411..e22bc8d4 100644 --- a/addons/xterm-addon-canvas/src/BaseRenderLayer.ts +++ b/addons/xterm-addon-canvas/src/BaseRenderLayer.ts @@ -369,7 +369,7 @@ export abstract class BaseRenderLayer extends Disposable implements IRenderLayer const chars = cell.getChars(); this._cellColorResolver.resolve(cell, x, this._bufferService.buffer.ydisp + y); - if (this._charAtlas === undefined || this._charAtlas === null) { + if (!this._charAtlas) { return; }