From f479fcd2e5f39b0706533382e1d96e1bbcede7c3 Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Thu, 25 May 2017 11:07:55 -0700
Subject: [PATCH] Add null check in terminalPanel click listener

Fixes #27256
---
 .../parts/terminal/electron-browser/terminalPanel.ts         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
index ec880bdd12c2..4b5a29f34c4f 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
@@ -197,11 +197,12 @@ export class TerminalPanel extends Panel {
 			this._cancelContextMenu = false;
 		}));
 		this._register(dom.addDisposableListener(this._parentDomElement, 'click', (event) => {
-			if (this._terminalService.terminalInstances.length === 0) {
+			if (event.which === 3) {
 				return;
 			}
 
-			if (event.which !== 3) {
+			const instance = this._terminalService.getActiveInstance();
+			if (instance) {
 				this._terminalService.getActiveInstance().focus();
 			}
 		}));