"workbench.iconTheme": null has no effect. Fixes #74448

This commit is contained in:
Martin Aeschlimann
2019-05-28 15:43:44 +02:00
parent af9cd4e8f2
commit c3201c6948
@@ -270,7 +270,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
if (devThemes.length) {
return this.setFileIconTheme(devThemes[0].id, ConfigurationTarget.MEMORY);
} else {
return this.setFileIconTheme(theme && theme.id || DEFAULT_ICON_THEME_ID, undefined);
return this.setFileIconTheme(theme ? theme.id : DEFAULT_ICON_THEME_ID, undefined);
}
});
}),
@@ -293,7 +293,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
let iconThemeSetting = this.configurationService.getValue<string | null>(ICON_THEME_SETTING);
if (iconThemeSetting !== this.currentIconTheme.settingsId) {
this.iconThemeStore.findThemeBySettingsId(iconThemeSetting).then(theme => {
this.setFileIconTheme(theme && theme.id || DEFAULT_ICON_THEME_ID, undefined);
this.setFileIconTheme(theme ? theme.id : DEFAULT_ICON_THEME_ID, undefined);
});
}
}