mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-23 21:05:44 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4003 from nextcloud/bugfix/errorBulkUpload

Browse source 
if BulkPropagatorJob abort after an error emit finished signal
This commit is contained in:
Matthieu Gallien 2021-11-26 15:31:15 +01:00 committed by GitHub
commit 436eced9fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libsync/bulkpropagatorjob.cpp
View file

@ -194,8 +194,10 @@ void BulkPropagatorJob::triggerUpload()
if (FileSystem::isFileLocked(singleFile._localPath)) {
emit propagator()->seenLockedFile(singleFile._localPath);
}
// Soft error because this is likely caused by the user modifying his files while syncing
abortWithError(singleFile._item, SyncFileItem::SoftError, device->errorString());
abortWithError(singleFile._item, SyncFileItem::NormalError, device->errorString());
emit finished(SyncFileItem::NormalError);
return;
}
singleFile._headers["X-File-Path"] = singleFile._remotePath.toUtf8();