From d045d39f8833ac16005d4b7dd95ea1795ee9f0c1 Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Thu, 19 Dec 2019 15:58:15 +1100
Subject: [PATCH] Move charset service reset out of _setup

---
 src/Terminal.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Terminal.ts b/src/Terminal.ts
index 2364ffd1..b89efdb6 100644
--- a/src/Terminal.ts
+++ b/src/Terminal.ts
@@ -247,9 +247,6 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
     this.insertMode = false;
     this.bracketedPasteMode = false;
 
-    // charset
-    this._charsetService.reset();
-
     this.params = [];
     this.currentParam = 0;
 
@@ -268,7 +265,9 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
       this.register(this._inputHandler);
     }
 
-    this.linkifier = this.linkifier || new Linkifier(this._bufferService, this._logService);
+    if (!this.linkifier) {
+      this.linkifier = new Linkifier(this._bufferService, this._logService);
+    }
 
     if (this.options.windowsMode) {
       this._enableWindowsMode();
@@ -1472,6 +1471,7 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
 
     this._setup();
     this._bufferService.reset();
+    this._charsetService.reset();
     this._coreService.reset();
     this._coreMouseService.reset();
     this._selectionService?.reset();