From 2a1f167165498ae8b08b910b1e22534a6201a648 Mon Sep 17 00:00:00 2001 From: Rachel Macfarlane Date: Fri, 10 Apr 2020 10:40:19 -0700 Subject: [PATCH] Fix #94888, preferences sync gets reenabled on reload --- src/vs/platform/environment/common/environment.ts | 2 +- src/vs/platform/environment/node/environmentService.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/platform/environment/common/environment.ts b/src/vs/platform/environment/common/environment.ts index c64c5fc6815..f899de2f910 100644 --- a/src/vs/platform/environment/common/environment.ts +++ b/src/vs/platform/environment/common/environment.ts @@ -39,7 +39,7 @@ export interface IEnvironmentService { // --- settings sync userDataSyncLogResource: URI; userDataSyncHome: URI; - sync: 'on' | 'off'; + sync: 'on' | 'off' | undefined; // --- extension development debugExtensionHost: IExtensionHostDebugParams; diff --git a/src/vs/platform/environment/node/environmentService.ts b/src/vs/platform/environment/node/environmentService.ts index 4008fe2109a..695594fcb58 100644 --- a/src/vs/platform/environment/node/environmentService.ts +++ b/src/vs/platform/environment/node/environmentService.ts @@ -92,7 +92,7 @@ export class EnvironmentService implements INativeEnvironmentService { get userDataSyncLogResource(): URI { return URI.file(path.join(this.logsPath, 'userDataSync.log')); } @memoize - get sync(): 'on' | 'off' { return this.args.sync === 'off' ? 'off' : 'on'; } + get sync(): 'on' | 'off' | undefined { return this.args.sync; } @memoize get machineSettingsResource(): URI { return resources.joinPath(URI.file(path.join(this.userDataPath, 'Machine')), 'settings.json'); } -- GitLab