From 0c59c85127f518478e795e57c887cc2bfb3e373b Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Fri, 16 Oct 2015 11:29:35 +0200 Subject: [PATCH] SyncEngine: Folders with ignored files should not count when counting none files If there is a any none files, we do not show the dialog saying that all files have been removed. If a directory contiains ignored files, we still want to show this message box even if the directory will not be deleted --- src/libsync/syncengine.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp index 1b58d0b1e..1f6205a7c 100644 --- a/src/libsync/syncengine.cpp +++ b/src/libsync/syncengine.cpp @@ -479,7 +479,9 @@ int SyncEngine::treewalkFile( TREE_WALK_FILE *file, bool remote ) dir = SyncFileItem::None; } else { // No need to do anything. - if (file->other.instruction == CSYNC_INSTRUCTION_NONE) { + if (file->other.instruction == CSYNC_INSTRUCTION_NONE + // Directories with ignored files does not count as 'None' + && (file->type != CSYNC_FTW_TYPE_DIR || !file->has_ignored_files)) { _hasNoneFiles = true; } -- 2.30.2