Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not display error status and messages when aborting a sync during hydration request in VFS mode #5579

Merged
merged 1 commit into from
Apr 7, 2023
Merged

Do not display error status and messages when aborting a sync during hydration request in VFS mode #5579

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/gui/folder.cpp
View file
Open in desktop
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