Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-20 23:29:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #142581

Browse Source
This commit is contained in:
Sandeep Somavarapu
2022-02-22 18:10:55 +01:00
parent 9fda39d0ef
commit aee3a5e1fa
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/platform/userDataSync/common/userDataSyncService.ts
+6 -2
View File
@@ -778,8 +778,12 @@ class ManualSyncTask extends Disposable implements IManualSyncTask {
private async getUserDataSyncConfiguration(): Promise<IUserDataSyncConfiguration> {
const local = this.configurationService.getValue<IUserDataSyncConfiguration>(USER_DATA_SYNC_CONFIGURATION_SCOPE);
const remote = await (<SettingsSynchroniser>this.synchronisers.find(synchronizer => synchronizer instanceof SettingsSynchroniser)).getRemoteUserDataSyncConfiguration(this.manifest);
return { ...local, ...remote };
const settingsSynchronizer = this.synchronisers.find(synchronizer => synchronizer instanceof SettingsSynchroniser);
if (settingsSynchronizer) {
const remote = await (<SettingsSynchroniser>settingsSynchronizer).getRemoteUserDataSyncConfiguration(this.manifest);
return { ...local, ...remote };
}
return local;
}
private toSyncResourcePreview(syncResource: SyncResource, preview: ISyncResourcePreview): [SyncResource, ISyncResourcePreview] {