Merge commit 'bc90e5a2' into or1-p4
This commit is contained in:
commit
fca2a80e81
2 files changed
+8
No files matched your search
@@ -51,6 +51,8 @@ commits follow Conventional Commits (release notes are generated from them by `C
|
||||
keeps *Change…* and *Move…* disabled until then. The Server header no longer shows this PC's local renders as server
|
||||
jobs; the *Copying originals* toast's Jobs button works; disabled *Copy originals…* and *Proxies only…* say why.
|
||||
Italian wording.
|
||||
- A workspace copy cancelled just before it committed (its last query already answered, the project's lease then free)
|
||||
could commit anyway and end *Done*, keeping the media it wrote; it now stops at the commit and its clean-up runs.
|
||||
|
||||
### Changed
|
||||
- *Pause uploads on metered* (Server screen) is now *Pause metered transfers*: on a metered connection the sync's
|
||||
|
||||
@@ -465,6 +465,9 @@ internal sealed class WorkspaceCopyJobHandler(ChronosDatabase db, ArchiveService
|
||||
// The working state is the editor's meanwhile: it is held only while the media index and the positions move.
|
||||
using (await project.LockAsync(LockWait, ct).ConfigureAwait(false))
|
||||
{
|
||||
// The commit point: a cancel that came while the copy waited (a query it did not stop, the lease) wins here,
|
||||
// so a cancelled copy never commits and its clean-up removes what it wrote.
|
||||
ct.ThrowIfCancellationRequested();
|
||||
Commit(project, project.ReadBundle(), media, row.Folder, row.DisplayTitle);
|
||||
RemoveStale(project, media, frames);
|
||||
}
|
||||
@@ -600,6 +603,9 @@ internal sealed class WorkspaceCopyJobHandler(ChronosDatabase db, ArchiveService
|
||||
// The working state is the editor's meanwhile: it is held only while the media index and the positions move.
|
||||
using (await project.LockAsync(LockWait, ct).ConfigureAwait(false))
|
||||
{
|
||||
// The commit point: a cancel that came while the copy waited (a query it did not stop, the lease) wins here,
|
||||
// so a cancelled copy never commits and its clean-up removes what it wrote.
|
||||
ct.ThrowIfCancellationRequested();
|
||||
Commit(project, project.ReadBundle(), media, folder, sequence.DisplayTitle);
|
||||
RemoveStale(project, media, frames);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user