From a428c17c379a32bd99073dd3ddb6e98270de8f8a Mon Sep 17 00:00:00 2001 From: alex-z Date: Thu, 6 Apr 2023 22:26:35 +0200 Subject: [PATCH] Do not display error status and messages when aborting a sync during hydration request in VFS mode. Signed-off-by: alex-z --- src/gui/folder.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp index eb7d6c0104261..9db1c3f77dec4 100644 --- a/src/gui/folder.cpp +++ b/src/gui/folder.cpp @@ -1101,6 +1101,12 @@ void Folder::slotItemCompleted(const SyncFileItemPtr &item) return; } + if (_silenceErrorsUntilNextSync + && (item->_status != SyncFileItem::Status::Success && item->_status != SyncFileItem::Status::NoStatus)) { + item->_errorString.clear(); + item->_status = SyncFileItem::Status::SoftError; + } + _syncResult.processCompletedItem(item); _fileLog->logItem(*item); @@ -1230,6 +1236,7 @@ void Folder::slotHydrationStarts() { // Abort any running full sync run and reschedule if (_engine->isSyncRunning()) { + setSilenceErrorsUntilNextSync(true); slotTerminateSync(); scheduleThisFolderSoon(); // TODO: This sets the sync state to AbortRequested on done, we don't want that