Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/microsoft/vscode.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src/vs
diff options
context:
space:
mode:
authorSandeep Somavarapu <sasomava@microsoft.com>2022-07-27 18:40:15 +0300
committerGitHub <noreply@github.com>2022-07-27 18:40:15 +0300
commit4474dab2fa8dcc12ece25e27b6422d3963e70fd6 (patch)
tree8436a18f1881913142bc56c49e9df0c72e30787b /src/vs
parent18fb2dde5d56a464b39f7b93e40dd5e2f38fc74a (diff)
Fix #156369 (#156433)
Diffstat (limited to 'src/vs')
-rw-r--r--src/vs/workbench/browser/web.main.ts5
-rw-r--r--src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts12
2 files changed, 11 insertions, 6 deletions
diff --git a/src/vs/workbench/browser/web.main.ts b/src/vs/workbench/browser/web.main.ts
index a307a64ec7e..02ea6a2b6cb 100644
--- a/src/vs/workbench/browser/web.main.ts
+++ b/src/vs/workbench/browser/web.main.ts
@@ -295,6 +295,11 @@ export class BrowserMain extends Disposable {
]);
userDataProfilesService.setEnablement(!!configurationService.getValue(PROFILES_ENABLEMENT_CONFIG));
+ this._register(configurationService.onDidChangeConfiguration(e => {
+ if (e.affectsConfiguration(PROFILES_ENABLEMENT_CONFIG)) {
+ userDataProfilesService.setEnablement(!!configurationService.getValue(PROFILES_ENABLEMENT_CONFIG));
+ }
+ }));
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
//
diff --git a/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts b/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts
index 1680881aeb1..2f96395016a 100644
--- a/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts
+++ b/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts
@@ -102,12 +102,6 @@ export class SettingsChangeRelauncher extends Disposable implements IWorkbenchCo
changed = true;
}
- // Profiles
- if (typeof config.workbench?.experimental?.settingsProfiles?.enabled === 'boolean' && config.workbench.experimental.settingsProfiles.enabled !== this.settingsProfilesEnabled) {
- this.settingsProfilesEnabled = config.workbench.experimental.settingsProfiles.enabled;
- changed = true;
- }
-
// On linux turning on accessibility support will also pass this flag to the chrome renderer, thus a restart is required
if (isLinux && typeof config.editor?.accessibilitySupport === 'string' && config.editor.accessibilitySupport !== this.accessibilitySupport) {
this.accessibilitySupport = config.editor.accessibilitySupport;
@@ -123,6 +117,12 @@ export class SettingsChangeRelauncher extends Disposable implements IWorkbenchCo
}
}
+ // Profiles
+ if (typeof config.workbench?.experimental?.settingsProfiles?.enabled === 'boolean' && config.workbench.experimental.settingsProfiles.enabled !== this.settingsProfilesEnabled) {
+ this.settingsProfilesEnabled = config.workbench.experimental.settingsProfiles.enabled;
+ changed = true;
+ }
+
// Notify only when changed and we are the focused window (avoids notification spam across windows)
if (notify && changed) {
this.doConfirm(