Fix microsoft#45549

marckassay · Mar 13, 2018 · 5478bd9 · 5478bd9
1 parent 11a262e
commit 5478bd9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/vs/workbench/browser/parts/views/customView.ts b/src/vs/workbench/browser/parts/views/customView.ts
@@ -133,7 +133,7 @@ class CustomTreeViewer extends Disposable implements ITreeViewer {
 				onDidChange = dataProvider.onDidChange;
 				onDispose = dataProvider.onDispose;
 				getChildren(node?: ITreeItem): TPromise<ITreeItem[]> {
-					if (node.children) {
+					if (node && node.children) {
 						return TPromise.as(node.children);
 					}
 					const promise = node instanceof Root ? dataProvider.getChildren() : dataProvider.getChildren(node);
@@ -464,7 +464,7 @@ class Aligner extends Disposable {
 		if (this.hasIcon(parent)) {
 			return false;
 		}
-		return parent.children.every(c => c.collapsibleState === TreeItemCollapsibleState.None || !this.hasIcon(c));
+		return parent.children && parent.children.every(c => c.collapsibleState === TreeItemCollapsibleState.None || !this.hasIcon(c));
 	}
 
 	private hasIcon(node: ITreeItem): boolean {