From 710934bdbd88f28e1614e0df33b69b6c1ec13313 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Wed, 18 Jul 2018 12:15:13 +0200 Subject: [PATCH] New disco algo: Fix TestSyncFileStatusTracker --- src/libsync/syncengine.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp index b45a3259a..aa1ea5bd5 100644 --- a/src/libsync/syncengine.cpp +++ b/src/libsync/syncengine.cpp @@ -440,6 +440,11 @@ void OCC::SyncEngine::slotItemDiscovered(const OCC::SyncFileItemPtr &item) } } } + + // check for blacklisting of this item. + // if the item is on blacklist, the instruction was set to ERROR + checkErrorBlacklisting(*item); + _needsUpdate = true; _syncItems.append(item); slotNewItem(item); } @@ -607,15 +612,6 @@ int SyncEngine::treewalkFile(csync_file_stat_t * /*file*/, csync_file_stat_t * / break; } - item->_direction = dir; - if (instruction != CSYNC_INSTRUCTION_NONE) { - // check for blacklisting of this item. - // if the item is on blacklist, the instruction was set to ERROR - checkErrorBlacklisting(*item); - } - - _needsUpdate = true; - slotNewItem(item);