From f4bb88811174cb974093e82e3659330b633af98a Mon Sep 17 00:00:00 2001 From: Martin Aeschlimann Date: Thu, 16 Feb 2017 12:24:25 +0100 Subject: [PATCH] [theme] Migrate settings in sequence to avoid flickering --- .../themes/electron-browser/themeService.ts | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/vs/workbench/services/themes/electron-browser/themeService.ts b/src/vs/workbench/services/themes/electron-browser/themeService.ts index 69d56e15eb3..eccf86e1471 100644 --- a/src/vs/workbench/services/themes/electron-browser/themeService.ts +++ b/src/vs/workbench/services/themes/electron-browser/themeService.ts @@ -338,18 +338,15 @@ export class ThemeService implements IThemeService { if (legacyColorThemeId || legacyIconThemeId) { this.storageService.remove('workbench.theme', StorageScope.GLOBAL); this.storageService.remove('workbench.iconTheme', StorageScope.GLOBAL); - return Promise.join([ - this.findThemeData(legacyColorThemeId, DEFAULT_THEME_ID).then(theme => { - let themeId = theme ? theme.id : DEFAULT_THEME_ID; - let target = themeId !== DEFAULT_THEME_ID ? ConfigurationTarget.USER : null; - return this.setColorTheme(themeId, target); - }), - this._findIconThemeData(legacyIconThemeId).then(theme => { - let themeId = theme && theme.id; - let target = themeId !== DEFAULT_THEME_ID ? ConfigurationTarget.USER : null; - return this.setFileIconTheme(themeId, target); - }) - ]); + return this.findThemeData(legacyColorThemeId, DEFAULT_THEME_ID).then(theme => { + let themeId = theme ? theme.id : DEFAULT_THEME_ID; + return this.setColorTheme(themeId, ConfigurationTarget.USER).then(_ => { + return this._findIconThemeData(legacyIconThemeId).then(theme => { + let themeId = theme && theme.id; + return this.setFileIconTheme(themeId, ConfigurationTarget.USER); + }); + }); + }); } -- GitLab