From 72c9754990f9deeacbf9b509288cadc3aa6d1209 Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Thu, 26 May 2016 09:50:52 +0200 Subject: [PATCH] fixes #6009 --- src/vs/base/parts/tree/browser/treeModel.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/vs/base/parts/tree/browser/treeModel.ts b/src/vs/base/parts/tree/browser/treeModel.ts index 1b80259f5aa..325ae44b9ab 100644 --- a/src/vs/base/parts/tree/browser/treeModel.ts +++ b/src/vs/base/parts/tree/browser/treeModel.ts @@ -391,6 +391,10 @@ export class Item extends Events.EventEmitter { } const result = childrenPromise.then((elements: any[]) => { + if (this.isDisposed()) { + return WinJS.TPromise.as(null); + } + elements = !elements ? [] : elements.slice(0); elements = this.sort(elements); -- GitLab