Skip to content

Commit

Permalink
Do not display error status and messages when aborting a sync during …
Browse files Browse the repository at this point in the history
…hydration request in VFS mode.

Signed-off-by: alex-z <blackslayer4@gmail.com>
  • Loading branch information
allexzander committed Apr 7, 2023
1 parent 22b0540 commit a298780
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions src/gui/folder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit a298780

Please sign in to comment.