Skip to content

Commit 0f3944a

Browse files
committed
fix disposable warnings
1 parent f0fa785 commit 0f3944a

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

src/vs/workbench/services/configuration/browser/configuration.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,12 @@ export class UserConfiguration extends Disposable {
5959
const fileServiceBasedConfiguration = new FileServiceBasedConfiguration(folder.toString(), [this.userSettingsResource], standAloneConfigurationResources, this.scopes, this.fileService);
6060
const configurationModel = await fileServiceBasedConfiguration.loadConfiguration();
6161
this.userConfiguration.value = fileServiceBasedConfiguration;
62-
this._register(fileServiceBasedConfiguration.onDidChange(() => this.reloadConfigurationScheduler.schedule()));
62+
63+
// Check for value because userConfiguration might have been disposed.
64+
if (this.userConfiguration.value) {
65+
this._register(this.userConfiguration.value.onDidChange(() => this.reloadConfigurationScheduler.schedule()));
66+
}
67+
6368
return configurationModel;
6469
}
6570

0 commit comments

Comments
 (0)