Skip to content

Fix hang during rename-and-move in Zotero 6#594

Merged
jlegewie merged 1 commit into
jlegewie:masterfrom
dstillman:rename-and-move-fix
Mar 23, 2022
Merged

Fix hang during rename-and-move in Zotero 6#594
jlegewie merged 1 commit into
jlegewie:masterfrom
dstillman:rename-and-move-fix

Conversation

@dstillman

Copy link
Copy Markdown
Contributor

Sorry, I broke things in zotero/zotero@734057ff9b.

Fixes #593

Resulting in not all annotations being transferred and the old
attachment not being deleted

Regression after zotero/zotero@734057ff9b, which added a transaction
requirement to `Zotero.Items.moveChildItems()` but tried to preserve
backwards compatibility with ZotFile. Unfortunately it had a bug, and a
race condition with another transacation during the process results in a
hang anyway if `moveChildItems()` isn't called in a transaction, so just
change ZotFile to follow the new requirement.

This also fixes `saveTx()` being called without an await.

Fixes jlegewie#593
@jlegewie jlegewie merged commit 688c423 into jlegewie:master Mar 23, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

"Rename and Move" only moves the first highlight/annotation

2 participants