Fixes #10016: the spinning bar (progress indicator) doesn't appear an…

…ymore after a running task gets terminated
microsoft · Aug 29, 2016 · b5c999e · b5c999e
1 parent e321941
commit b5c999e
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts b/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
@@ -504,11 +504,17 @@ class StatusBarItem implements IStatusbarItem {
 		}));
 
 		callOnDispose.push(this.taskService.addListener2(TaskServiceEvents.Inactive, (data:TaskServiceEventData) => {
-			this.activeCount--;
-			if (this.activeCount === 0) {
-				$(progress).hide();
-				clearInterval(this.intervalToken);
-				this.intervalToken = null;
+			// Since the exiting of the sub process is communicated async we can't order inactive and terminate events.
+			// So try to treat them accordingly.
+			if (this.activeCount > 0) {
+				this.activeCount--;
+				if (this.activeCount === 0) {
+					$(progress).hide();
+					if (this.intervalToken) {
+						clearInterval(this.intervalToken);
+						this.intervalToken = null;
+					}
+				}
 			}
 		}));