From 72ef0246785094ab3603e4af5d6bfb605f912ef6 Mon Sep 17 00:00:00 2001 From: Karl Burtram Date: Tue, 2 Apr 2019 11:56:45 -0700 Subject: [PATCH] Check for null ref in query statusbar timer (#4804) --- src/sql/parts/query/common/timeElapsedStatus.ts | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/sql/parts/query/common/timeElapsedStatus.ts b/src/sql/parts/query/common/timeElapsedStatus.ts index 970060062d..43a1238796 100644 --- a/src/sql/parts/query/common/timeElapsedStatus.ts +++ b/src/sql/parts/query/common/timeElapsedStatus.ts @@ -96,11 +96,16 @@ export class TimeElapsedStatusBarItem implements IStatusbarItem { this.intervalTimer.cancel(); if (runner.isExecuting) { this.intervalTimer.cancelAndSet(() => { - this._flavorElement.innerText = parseNumAsTimeString(Date.now() - runner.queryStartTime.getTime(), false); + let value = runner.queryStartTime ? Date.now() - runner.queryStartTime.getTime() : 0; + this._flavorElement.innerText = parseNumAsTimeString(value, false); }, 1000); - this._flavorElement.innerText = parseNumAsTimeString(Date.now() - runner.queryStartTime.getTime(), false); + + let value = runner.queryStartTime ? Date.now() - runner.queryStartTime.getTime() : 0; + this._flavorElement.innerText = parseNumAsTimeString(value, false); } else { - this._flavorElement.innerText = parseNumAsTimeString(runner.queryEndTime.getTime() - runner.queryStartTime.getTime(), false); + let value = runner.queryStartTime && runner.queryEndTime + ? runner.queryEndTime.getTime() - runner.queryStartTime.getTime() : 0; + this._flavorElement.innerText = parseNumAsTimeString(value, false); } show(this._flavorElement); }