Fix #17676

microsoft · Dec 21, 2016 · c7e9ec9 · c7e9ec9
1 parent 42e4f0d
commit c7e9ec9
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/src/vs/workbench/parts/search/browser/replaceService.ts b/src/vs/workbench/parts/search/browser/replaceService.ts
@@ -152,14 +152,20 @@ export class ReplaceService implements IReplaceService {
 			.then(([sourceModelRef, replaceModelRef]) => {
 				const sourceModel = sourceModelRef.object.textEditorModel;
 				const replaceModel = replaceModelRef.object.textEditorModel;
-				if (override) {
-					replaceModel.setValue(sourceModel.getValue());
-				} else {
-					replaceModel.undo();
+				let returnValue = TPromise.wrap(null);
+				// If model is disposed do not update
+				if (sourceModel && replaceModel) {
+					if (override) {
+						replaceModel.setValue(sourceModel.getValue());
+					} else {
+						replaceModel.undo();
+					}
+					returnValue = this.replace(fileMatch, null, replacePreviewUri);
 				}
-				sourceModelRef.dispose();
-				replaceModelRef.dispose();
-				return this.replace(fileMatch, null, replacePreviewUri);
+				return returnValue.then(() => {
+					sourceModelRef.dispose();
+					replaceModelRef.dispose();
+				});
 			});
 	}