Calculate the sidebar optimal width correctly in case no folder is open

microsoft · Apr 15, 2016 · bfe45ae · bfe45ae
1 parent b6036c7
commit bfe45ae
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/vs/workbench/parts/files/browser/explorerViewlet.ts b/src/vs/workbench/parts/files/browser/explorerViewlet.ts
@@ -177,9 +177,10 @@ export class ExplorerViewlet extends Viewlet {
 
 	public getOptimalWidth(): number {
 		let additionalMargin = 16;
-		let optimalWidth = Math.max(
-			this.getWorkingFilesView().getOptimalWidth(),
-			this.getExplorerView().getOptimalWidth());
+		let workingFilesViewWidth = this.getWorkingFilesView().getOptimalWidth();
+		let explorerView = this.getExplorerView();
+		let explorerViewWidth = explorerView ? explorerView.getOptimalWidth() : 0;
+		let optimalWidth = Math.max(workingFilesViewWidth, explorerViewWidth);
 		return optimalWidth + additionalMargin;
 	}