mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-12-18 11:51:51 +03:00
Code Issues Projects Releases Packages Wiki Activity

if BulkPropagatorJob abort after an error emit finished signal

Browse source 
prevent sync engine being stuck because of an error when preparing bulk
upload

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
This commit is contained in:
Matthieu Gallien 2021-11-25 10:17:47 +01:00
parent 56f4198b28
commit f56985938d
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)) { if (FileSystem::isFileLocked(singleFile._localPath)) {
emit propagator()->seenLockedFile(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; return;
} }
singleFile._headers["X-File-Path"] = singleFile._remotePath.toUtf8(); singleFile._headers["X-File-Path"] = singleFile._remotePath.toUtf8();