Fix microsoft#100714

sandy081 · sandy081 · commit 8b981e167aef · 2020-06-29T18:04:12.000+02:00
diff --git a/src/vs/platform/userDataSync/common/userDataAutoSyncService.ts b/src/vs/platform/userDataSync/common/userDataAutoSyncService.ts
@@ -169,7 +169,7 @@ export class UserDataAutoSyncService extends UserDataAutoSyncEnablementService i
 		try {
 
 			// Remove machine
-			if (!donotRemoveMachine) {
+			if (this.userDataSyncAccountService.account && !donotRemoveMachine) {
 				await this.userDataSyncMachinesService.removeCurrentMachine();
 			}
 
diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
@@ -569,9 +569,9 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 			message: localize('turn off sync confirmation', "Do you want to turn off sync?"),
 			detail: localize('turn off sync detail', "Your settings, keybindings, extensions and UI State will no longer be synced."),
 			primaryButton: localize('turn off', "Turn Off"),
-			checkbox: {
+			checkbox: this.userDataSyncWorkbenchService.accountStatus === AccountStatus.Available ? {
 				label: localize('turn off sync everywhere', "Turn off sync on all your devices and clear the data from the cloud.")
-			}
+			} : undefined
 		});
 		if (result.confirmed) {
 			return this.userDataSyncWorkbenchService.turnoff(!!result.checkboxChecked);

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ export class UserDataAutoSyncService extends UserDataAutoSyncEnablementService i`
`169`	`169`	`try {`
`170`	`170`
`171`	`171`	`// Remove machine`
`172`		`- if (!donotRemoveMachine) {`
	`172`	`+ if (this.userDataSyncAccountService.account && !donotRemoveMachine) {`
`173`	`173`	`await this.userDataSyncMachinesService.removeCurrentMachine();`
`174`	`174`	`}`
`175`	`175`