jody/joplin
1
0 Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2026-10-25 02:47:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Desktop: Fixes #16758: Stop external editing when a note gets locked on another device (#16762)

Browse Source
This commit is contained in:
Keshav authored and GitHub committed 2026-10-11 16:07:47 +01:00
1 parent 052583a8fb
commit 3f7dde0045
3 files changed
+42 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/lib/services/ExternalEditWatcher.ts
+3 -2
View File
@@ -300,10 +300,11 @@ export default class ExternalEditWatcher {
this.logger().info(`ExternalEditWatcher: Started watching ${filePath}`);
}
public async stopWatching(noteId: string) {
// Without a flush, a pending change finds the file removed below and is dropped.
public async stopWatching(noteId: string, flushPendingChanges = true) {
if (!noteId) return;
await this.changeEventQueue_.processAllNow();
if (flushPendingChanges) await this.changeEventQueue_.processAllNow();
const filePath = this.noteIdToFilePath_(noteId);
if (this.watcher_) this.watcher_.unwatch(filePath);