diff --git a/package.json b/package.json index 67cd7a8a0d2..e68a2147364 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "code-oss-dev", "version": "1.53.0", - "distro": "14d443d2e9005079e015f35a75d3bb0798c80a36", + "distro": "ef4e25f8dccec71b96ee8c6d0a770f1e53bcf84c", "author": { "name": "Microsoft Corporation" }, @@ -225,4 +225,4 @@ "elliptic": "^6.5.3", "nwmatcher": "^1.4.4" } -} +} \ No newline at end of file diff --git a/src/vs/code/browser/workbench/workbench.ts b/src/vs/code/browser/workbench/workbench.ts index bc70b9b99c2..1ed7feec97b 100644 --- a/src/vs/code/browser/workbench/workbench.ts +++ b/src/vs/code/browser/workbench/workbench.ts @@ -503,20 +503,17 @@ class WindowIndicator implements IWindowIndicator { const settingsSyncOptions: ISettingsSyncOptions | undefined = config.settingsSyncOptions ? { enabled: config.settingsSyncOptions.enabled, enablementHandler: (enablement) => { - // Handle enablement only if settings sync is enabled by default - if (config.settingsSyncOptions?.enabled) { - let queryString = `settingsSync=${enablement ? 'true' : 'false'}`; + let queryString = `settingsSync=${enablement ? 'true' : 'false'}`; - // Save all other query params we might have - const query = new URL(document.location.href).searchParams; - query.forEach((value, key) => { - if (key !== 'settingsSync') { - queryString += `&${key}=${value}`; - } - }); + // Save all other query params we might have + const query = new URL(document.location.href).searchParams; + query.forEach((value, key) => { + if (key !== 'settingsSync') { + queryString += `&${key}=${value}`; + } + }); - window.location.href = `${window.location.origin}?${queryString}`; - } + window.location.href = `${window.location.origin}?${queryString}`; } } : undefined; diff --git a/src/vs/workbench/services/userDataSync/browser/userDataAutoSyncEnablementService.ts b/src/vs/workbench/services/userDataSync/browser/userDataAutoSyncEnablementService.ts index d0e5a506853..e8db74c6fee 100644 --- a/src/vs/workbench/services/userDataSync/browser/userDataAutoSyncEnablementService.ts +++ b/src/vs/workbench/services/userDataSync/browser/userDataAutoSyncEnablementService.ts @@ -24,12 +24,9 @@ export class WebUserDataAutoSyncEnablementService extends UserDataAutoSyncEnable setEnablement(enabled: boolean) { if (this.enabled !== enabled) { this.enabled = enabled; - if (this.workbenchEnvironmentService.options?.settingsSyncOptions) { - if (this.workbenchEnvironmentService.options.settingsSyncOptions?.enablementHandler) { - this.workbenchEnvironmentService.options.settingsSyncOptions.enablementHandler(this.enabled); - } - } else { - super.setEnablement(enabled); + super.setEnablement(enabled); + if (this.workbenchEnvironmentService.options?.settingsSyncOptions?.enablementHandler) { + this.workbenchEnvironmentService.options.settingsSyncOptions.enablementHandler(this.enabled); } } }