fix #194065 (#194292)

microsoft · Sep 27, 2023 · f997118 · f997118
1 parent 707e061
commit f997118
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/vs/platform/userDataSync/common/userDataSyncService.ts b/src/vs/platform/userDataSync/common/userDataSyncService.ts
@@ -219,6 +219,9 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
 				await this.syncRemoteProfiles(syncProfiles, manifest, merge, executionId, token);
 			}
 		} finally {
+			if (this.status !== SyncStatus.HasConflicts) {
+				this.setStatus(SyncStatus.Idle);
+			}
 			this._onSyncErrors.fire(this._syncErrors);
 		}
 	}