mirror of
https://github.com/nextcloud/desktop.git
synced 2024-10-24 05:15:40 +03:00
Do not display error status and messages when aborting a sync during hydration request in VFS mode.
Signed-off-by: alex-z <blackslayer4@gmail.com>
This commit is contained in:
parent
8a7f0d92eb
commit
a428c17c37
1 changed files with 7 additions and 0 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue