diff --git a/src/vs/platform/userDataSync/common/abstractSynchronizer.ts b/src/vs/platform/userDataSync/common/abstractSynchronizer.ts index 88e4f41c68d9e8b4f02f121b7b65959709e25b33..a8620668649d3be98265ceedced6f2d31435d2e5 100644 --- a/src/vs/platform/userDataSync/common/abstractSynchronizer.ts +++ b/src/vs/platform/userDataSync/common/abstractSynchronizer.ts @@ -237,11 +237,10 @@ export abstract class AbstractSynchroniser extends Disposable { this.logService.trace(`${this.syncResourceLogLabel}: Started synchronizing ${this.resource.toLowerCase()}...`); this.setStatus(SyncStatus.Syncing); - const lastSyncUserData = await this.getLastSyncUserData(); - const remoteUserData = await this.getLatestRemoteUserData(manifest, lastSyncUserData); - let status: SyncStatus = SyncStatus.Idle; try { + const lastSyncUserData = await this.getLastSyncUserData(); + const remoteUserData = await this.getLatestRemoteUserData(manifest, lastSyncUserData); status = await this.performSync(remoteUserData, lastSyncUserData); if (status === SyncStatus.HasConflicts) { this.logService.info(`${this.syncResourceLogLabel}: Detected conflicts while synchronizing ${this.resource.toLowerCase()}.`);