This commit is contained in:
syuilo 2025-05-31 15:29:41 +09:00
parent f5bd895e18
commit fed783773c
1 changed files with 2 additions and 0 deletions

View File

@ -419,7 +419,9 @@ export class PreferencesManager {
let newValue = record[1];
console.log({ key, scope: record[0] });
const existing = await this.storageProvider.cloudGet({ key, scope: record[0] });
console.log(record[1], existing?.value, deepEqual(record[1], existing?.value));
if (existing != null && !deepEqual(record[1], existing.value)) {
const resolvedValue = await resolveConflict(record[1], existing.value);
if (resolvedValue === undefined) return { enabled: false }; // canceled