Merge pull request #1821 from Tyriar/dispose_atlas

Call dispose when atlas is no longer used in cache
xtermjs · Dec 10, 2018 · f34c3d5 · f34c3d5
2 parents e1b3c72 + fe9eb7d
commit f34c3d5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/renderer/atlas/CharAtlasCache.ts b/src/renderer/atlas/CharAtlasCache.ts
@@ -42,8 +42,6 @@ export function acquireCharAtlas(
 ): BaseCharAtlas {
   const newConfig = generateConfig(scaledCharWidth, scaledCharHeight, terminal, colors);
 
-  // TODO: Currently if a terminal changes configs it will not free the entry reference (until it's disposed)
-
   // Check to see if the terminal already owns this config
   for (let i = 0; i < charAtlasCache.length; i++) {
     const entry = charAtlasCache[i];
@@ -54,6 +52,7 @@ export function acquireCharAtlas(
       }
       // The configs differ, release the terminal from the entry
       if (entry.ownedBy.length === 1) {
+        entry.atlas.dispose();
         charAtlasCache.splice(i, 1);
       } else {
         entry.ownedBy.splice(ownedByIndex, 1);
@@ -94,6 +93,7 @@ export function removeTerminalFromCache(terminal: ITerminal): void {
     if (index !== -1) {
       if (charAtlasCache[i].ownedBy.length === 1) {
         // Remove the cache entry if it's the only terminal
+        charAtlasCache[i].atlas.dispose();
         charAtlasCache.splice(i, 1);
       } else {
         // Remove the reference from the cache entry