fix microsoft#48767

jrieken · jrieken · commit 31ebb53fd8d1 · 2018-04-26T18:34:21.000+02:00
diff --git a/src/vs/base/common/async.ts b/src/vs/base/common/async.ts
@@ -29,11 +29,21 @@ export function asWinJsPromise<T>(callback: (token: CancellationToken) => T | TP
 	return new TPromise<T>((resolve, reject, progress) => {
 		let item = callback(source.token);
 		if (item instanceof TPromise) {
-			always(item, () => source.dispose());
-			item.then(resolve, reject, progress);
+			item.then(result => {
+				source.dispose();
+				resolve(result);
+			}, err => {
+				source.dispose();
+				reject(err);
+			}, progress);
 		} else if (isThenable<T>(item)) {
-			always(item, () => source.dispose());
-			item.then(resolve, reject);
+			item.then(result => {
+				source.dispose();
+				resolve(result);
+			}, err => {
+				source.dispose();
+				reject(err);
+			});
 		} else {
 			source.dispose();
 			resolve(item);
