From f56985938d9258f6f57a44c15f22287fa0e45da9 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Thu, 25 Nov 2021 10:17:47 +0100 Subject: [PATCH] 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 --- src/libsync/bulkpropagatorjob.cpp | 6 ++++-- 1 file 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();