mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5579 from nextcloud/feature/improve-error-information-when-hydrating

Browse Source 
Do not display error status and messages when aborting a sync during hydration request in VFS mode
This commit is contained in:
allexzander 2023-04-07 10:08:32 +02:00 committed by GitHub
commit 0aa3ad8ee2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/folder.cpp
View File

@ -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