development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 13:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix switching to insiders when settings sync is disabled

Browse source
This commit is contained in:
Sandeep Somavarapu 2021-07-27 21:47:03 +02:00
parent d9cc12292d
commit c35100aba3
No known key found for this signature in database
GPG key ID: 1FED25EC4646638B
1 changed files with 46 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/vs/workbench/contrib/update/browser/update.ts
View file

@ -529,7 +529,9 @@ export class SwitchProductQualityContribution extends Disposable implements IWor
const storageService = accessor.get(IStorageService);
const userDataSyncWorkbenchService = accessor.get(IUserDataSyncWorkbenchService);
const userDataSyncService = accessor.get(IUserDataSyncService);
const notificationService = accessor.get(INotificationService);
try {
const selectSettingsSyncServiceDialogShownKey = 'switchQuality.selectSettingsSyncServiceDialogShown';
const userDataSyncStore = userDataSyncStoreManagementService.userDataSyncStore;
let userDataSyncStoreType: UserDataSyncStoreType | undefined;
@ -563,8 +565,8 @@ export class SwitchProductQualityContribution extends Disposable implements IWor
promises.push(Event.toPromise(Event.filter(userDataSyncService.onDidChangeStatus, status => status !== SyncStatus.Syncing)));
}
// Synchronise the store type option in insiders service, so that other clients using insiders service are also updated.
if (isSwitchingToInsiders) {
// If user chose the sync service then synchronise the store type option in insiders service, so that other clients using insiders service are also updated.
if (isSwitchingToInsiders && userDataSyncStoreType) {
promises.push(userDataSyncWorkbenchService.synchroniseUserDataSyncStoreType());
}
@ -577,6 +579,9 @@ export class SwitchProductQualityContribution extends Disposable implements IWor
storageService.remove(selectSettingsSyncServiceDialogShownKey, StorageScope.GLOBAL);
}
}
} catch (error) {
notificationService.error(error);
}
}
private async selectSettingsSyncService(dialogService: IDialogService): Promise<UserDataSyncStoreType | undefined> {