Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/desktop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Gallien <matthieu.gallien@nextcloud.com>2021-11-25 12:17:47 +0300
committerMatthieu Gallien <matthieu.gallien@nextcloud.com>2021-11-26 14:48:38 +0300
commitf56985938d9258f6f57a44c15f22287fa0e45da9 (patch)
tree6276ef1adc1fe5dd8a87d1c8fb1ece938726f4e0 /src/libsync
parent56f4198b28b1a3d923f0faaba95b6f109e661231 (diff)
if BulkPropagatorJob abort after an error emit finished signal
prevent sync engine being stuck because of an error when preparing bulk upload Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Diffstat (limited to 'src/libsync')
-rw-r--r--src/libsync/bulkpropagatorjob.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/libsync/bulkpropagatorjob.cpp b/src/libsync/bulkpropagatorjob.cpp
index 3803bd5ee..3aa8b76a2 100644
--- a/src/libsync/bulkpropagatorjob.cpp
+++ b/src/libsync/bulkpropagatorjob.cpp
@@ -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();