From 79fbff875e4332dffed4905daf840e7d4b23a949 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Fri, 19 Aug 2016 09:34:27 +0200 Subject: [PATCH] files config can be null --- .../workbench/parts/git/electron-browser/electronGitService.ts | 2 +- .../workbench/services/themes/electron-browser/themeService.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/parts/git/electron-browser/electronGitService.ts b/src/vs/workbench/parts/git/electron-browser/electronGitService.ts index 7c695170f32..cb677cf7595 100644 --- a/src/vs/workbench/parts/git/electron-browser/electronGitService.ts +++ b/src/vs/workbench/parts/git/electron-browser/electronGitService.ts @@ -217,7 +217,7 @@ export class ElectronGitService extends GitService { raw = new NoOpGitService(); } else { const gitPath = conf.path || null; - const encoding = filesConf.encoding || 'utf8'; + const encoding = (filesConf && filesConf.encoding) || 'utf8'; const workspaceRoot = workspace.resource.fsPath; const verbose = !environmentService.isBuilt || environmentService.verbose; diff --git a/src/vs/workbench/services/themes/electron-browser/themeService.ts b/src/vs/workbench/services/themes/electron-browser/themeService.ts index 3370102c97a..ff1b8ac7fc8 100644 --- a/src/vs/workbench/services/themes/electron-browser/themeService.ts +++ b/src/vs/workbench/services/themes/electron-browser/themeService.ts @@ -199,7 +199,7 @@ export class ThemeService implements IThemeService { }); configurationService.loadConfiguration('files').then((settings: any) => { - let iconSet = settings.iconSet; + let iconSet = settings && settings.iconSet; if (iconSet) { this.setFileIcons(iconSet); }