diff options
| author | syuilo <4439005+syuilo@users.noreply.github.com> | 2025-03-12 21:05:39 +0900 |
|---|---|---|
| committer | syuilo <4439005+syuilo@users.noreply.github.com> | 2025-03-12 21:05:39 +0900 |
| commit | a06b9eefaa550b2fa67ad661384d431cc842bfc2 (patch) | |
| tree | ce1ebbba53024bb7375ebf016a3d825800236e48 /packages/frontend/src/preferences | |
| parent | fix(frontend): fix type errors (diff) | |
| download | sharkey-a06b9eefaa550b2fa67ad661384d431cc842bfc2.tar.gz sharkey-a06b9eefaa550b2fa67ad661384d431cc842bfc2.tar.bz2 sharkey-a06b9eefaa550b2fa67ad661384d431cc842bfc2.zip | |
enhance(frontend): suppress needless confirmation when turn on pref sync
Diffstat (limited to 'packages/frontend/src/preferences')
| -rw-r--r-- | packages/frontend/src/preferences/manager.ts | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/frontend/src/preferences/manager.ts b/packages/frontend/src/preferences/manager.ts index 9866227d93..3f3eba6389 100644 --- a/packages/frontend/src/preferences/manager.ts +++ b/packages/frontend/src/preferences/manager.ts @@ -13,6 +13,7 @@ import { $i } from '@/account.js'; import { copyToClipboard } from '@/utility/copy-to-clipboard.js'; import { i18n } from '@/i18n.js'; import * as os from '@/os.js'; +import { deepEqual } from '@/utility/deep-equal.js'; // NOTE: 明示的な設定値のひとつとして null もあり得るため、設定が存在しないかどうかを判定する目的で null で比較したり ?? を使ってはいけない @@ -340,7 +341,7 @@ export class ProfileManager { const record = this.getMatchedRecordOf(key); const existing = await this.storageProvider.cloudGet({ key, cond: record[0] }); - if (existing != null) { + if (existing != null && !deepEqual(existing.value, record[1])) { const { canceled, result } = await os.select({ title: i18n.ts.preferenceSyncConflictTitle, text: i18n.ts.preferenceSyncConflictText, |