Skip to content

Commit 9580998

Browse files
authored
make sure theme is loaded when restoring it. Fixes microsoft#138422 (microsoft#138512)
1 parent 7e87a08 commit 9580998

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

src/vs/workbench/services/themes/browser/workbenchThemeService.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
481481
if (settingId !== this.currentColorTheme.settingsId) {
482482
await this.internalSetColorTheme(theme.id, undefined);
483483
} else if (theme !== this.currentColorTheme) {
484+
await theme.ensureLoaded(this.extensionResourceLoaderService);
484485
theme.setCustomizations(this.settings);
485486
await this.applyTheme(theme, undefined, true);
486487
}
@@ -656,6 +657,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
656657
if (settingId !== this.currentFileIconTheme.settingsId) {
657658
await this.internalSetFileIconTheme(theme.id, undefined);
658659
} else if (theme !== this.currentFileIconTheme) {
660+
await theme.ensureLoaded(this.extensionResourceLoaderService);
659661
this.applyAndSetFileIconTheme(theme, true);
660662
}
661663
return true;
@@ -761,6 +763,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
761763
if (settingId !== this.currentProductIconTheme.settingsId) {
762764
await this.internalSetProductIconTheme(theme.id, undefined);
763765
} else if (theme !== this.currentProductIconTheme) {
766+
await theme.ensureLoaded(this.extensionResourceLoaderService, this.logService);
764767
this.applyAndSetProductIconTheme(theme, true);
765768
}
766769
return true;

0 commit comments

Comments
 (0)