Merge pull request #10833 from paveldk/pkolev/fix-terminated-worker

Fix sending message to terminated worker
microsoft · Aug 29, 2016 · f954045 · f954045
2 parents b15d8ec + b241866
commit f954045
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/vs/base/common/worker/workerClient.ts b/src/vs/base/common/worker/workerClient.ts
@@ -227,7 +227,9 @@ export class WorkerClient {
 	}
 
 	private _postMessage(msg:any): void {
-		this._worker.postMessage(stringify(msg));
+		if (this._worker) {
+			this._worker.postMessage(stringify(msg));
+		}
 	}
 
 	private _onSerializedMessage(msg:string): void {

diff --git a/src/vs/base/worker/defaultWorkerFactory.ts b/src/vs/base/worker/defaultWorkerFactory.ts
@@ -41,7 +41,9 @@ class WebWorker implements IWorker {
 	}
 
 	public postMessage(msg:string): void {
-		this.worker.postMessage(msg);
+		if (this.worker) {
+			this.worker.postMessage(msg);
+		}
 	}
 
 	public dispose(): void {