self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-23 22:36:32 +02:00
Code Issues Releases Activity

Desktop: Fixes #11594: Fix syncLockGoneError on sync with certain share configs (#11611)

Browse Source
This commit is contained in:
Henry Heino
2025-01-09 07:28:24 -08:00
committed by GitHub
parent e1e2ba8888
commit 597f3188bd
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/lib/Synchronizer.ts
View File

@@ -337,8 +337,10 @@ export default class Synchronizer {
const hasActiveExclusiveLock = await hasActiveLock(locks, currentDate, this.lockHandler().lockTtl, LockType.Exclusive); const hasActiveExclusiveLock = await hasActiveLock(locks, currentDate, this.lockHandler().lockTtl, LockType.Exclusive);
if (hasActiveExclusiveLock) return 'hasExclusiveLock'; if (hasActiveExclusiveLock) return 'hasExclusiveLock';
const hasActiveSyncLock = await hasActiveLock(locks, currentDate, this.lockHandler().lockTtl, LockType.Sync, this.lockClientType(), this.clientId_); if (this.lockHandler().enabled) {
if (!hasActiveSyncLock) return 'syncLockGone'; const hasActiveSyncLock = await hasActiveLock(locks, currentDate, this.lockHandler().lockTtl, LockType.Sync, this.lockClientType(), this.clientId_);
if (!hasActiveSyncLock) return 'syncLockGone';
}
return ''; return '';
} }