Merge remote-tracking branch 'origin/master' into pr/princjef/1460

2018-07-03 11:50:07 -07:00
parent eabb25c796 9aad2f7ca5
commit 6d9d2a3304
91 changed files with 2746 additions and 1376 deletions
@@ -260,7 +260,9 @@ export class TextRenderLayer extends BaseRenderLayer {
      return;
    }

-    this._charAtlas.beginFrame();
+    if (this._charAtlas) {
+      this._charAtlas.beginFrame();
+    }

    this.clearCells(0, firstRow, terminal.cols, lastRow - firstRow + 1);
    this._drawBackground(terminal, firstRow, lastRow);