#57618 Cancelling the model update should reset the model update flag

microsoft · Sep 6, 2018 · d559704 · d559704
1 parent 39cc093
commit d559704
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/vs/workbench/parts/output/electron-browser/outputServices.ts b/src/vs/workbench/parts/output/electron-browser/outputServices.ts
@@ -115,6 +115,7 @@ abstract class AbstractFileOutputChannel extends Disposable {
 	clear(): void {
 		if (this.modelUpdater.isScheduled()) {
 			this.modelUpdater.cancel();
+			this.onUpdateModelCancelled();
 		}
 		if (this.model) {
 			this.model.setValue('');
@@ -149,6 +150,7 @@ abstract class AbstractFileOutputChannel extends Disposable {
 
 	protected onModelCreated(model: ITextModel) { }
 	protected onModelWillDispose(model: ITextModel) { }
+	protected onUpdateModelCancelled() { }
 	protected updateModel() { }
 
 	dispose(): void {
@@ -371,6 +373,10 @@ class FileOutputChannel extends AbstractFileOutputChannel implements OutputChann
 		this.fileHandler.unwatch();
 	}
 
+	protected onUpdateModelCancelled(): void {
+		this.updateInProgress = false;
+	}
+
 	private onDidContentChange(): void {
 		if (!this.updateInProgress) {
 			this.updateInProgress = true;