Merge branch 'master' into ctrl-alt-sequences

2018-02-13 14:59:46 -08:00
parent 18f6556061 712b91a971
commit 51d2064061
2 changed files with 5 additions and 2 deletions
@@ -1918,7 +1918,9 @@ export class Terminal extends EventEmitter implements ITerminal, IInputHandlingT
    this.rows = y;
    this.buffers.setupTabStops(this.cols);

-    this.charMeasure.measure(this.options);
+    if (this.charMeasure) {
+      this.charMeasure.measure(this.options);
+    }

    this.refresh(0, this.rows - 1);
    this.emit('resize', {cols: x, rows: y});