From 1f5b3988d853323f04980fa636cbd5e7f94cab70 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Mon, 11 Feb 2019 23:41:24 +0100 Subject: [PATCH] #68408 Consider null fle icon theme --- .../contrib/extensions/electron-browser/extensionsActions.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/contrib/extensions/electron-browser/extensionsActions.ts b/src/vs/workbench/contrib/extensions/electron-browser/extensionsActions.ts index 4052760efdb..ed5b9503d7c 100644 --- a/src/vs/workbench/contrib/extensions/electron-browser/extensionsActions.ts +++ b/src/vs/workbench/contrib/extensions/electron-browser/extensionsActions.ts @@ -1209,7 +1209,7 @@ export class SetFileIconThemeAction extends ExtensionAction { } let fileIconThemes = await this.workbenchThemeService.getFileIconThemes(new ExtensionIdentifier(this.extension.identifier.id)); const allThemes = await this.workbenchThemeService.getFileIconThemes(); - const currentTheme = allThemes.filter(t => t.settingsId === this.configurationService.getValue(ICON_THEME_SETTING))[0]; + const currentTheme = allThemes.filter(t => t.settingsId === this.configurationService.getValue(ICON_THEME_SETTING))[0] || this.workbenchThemeService.getFileIconTheme(); showCurrentTheme = showCurrentTheme || fileIconThemes.some(t => t.id === currentTheme.id); if (showCurrentTheme) { fileIconThemes = fileIconThemes.filter(t => t.id !== currentTheme.id); @@ -1218,7 +1218,7 @@ export class SetFileIconThemeAction extends ExtensionAction { const delayer = new Delayer(100); const picks: (IQuickPickItem | IQuickPickSeparator)[] = []; picks.push(...fileIconThemes.map(theme => ({ label: theme.label, id: theme.id }))); - if (showCurrentTheme) { + if (showCurrentTheme && currentTheme.label) { picks.push({ type: 'separator', label: localize('current', "Current") }); picks.push({ label: currentTheme.label, id: currentTheme.id }); } -- GitLab