Fix: showQuickPick keeps showing infinite progress (fixes #50863)

microsoft · May 31, 2018 · 3851c47 · 3851c47
1 parent c72c9fe
commit 3851c47
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -632,10 +632,15 @@ export class QuickInputService extends Component implements IQuickInputService {
 		const d = token.onCancellationRequested(() => this.close());
 		this.controller.result.then(() => d.dispose(), () => d.dispose());
 
+		const wasController = this.controller;
+
 		const delay = TPromise.timeout(800);
-		delay.then(() => this.progressBar.infinite(), () => { /* ignore */ });
+		delay.then(() => {
+			if (this.controller === wasController) {
+				this.progressBar.infinite();
+			}
+		}, () => { /* ignore */ });
 
-		const wasController = this.controller;
 		this.controller.ready.then(() => {
 			delay.cancel();
 			if (this.controller !== wasController) {