diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:17:08 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:17:08 +0200 |
| commit | cc9a53cd3874c35e9caf47b44224abc159526891 (patch) | |
| tree | b13b5c0ddb471a109ac648d469f72dcc6f9c6e07 /file_hierarchy.cpp | |
| parent | 4.3 (diff) | |
| download | FreeFileSync-cc9a53cd3874c35e9caf47b44224abc159526891.tar.gz FreeFileSync-cc9a53cd3874c35e9caf47b44224abc159526891.tar.bz2 FreeFileSync-cc9a53cd3874c35e9caf47b44224abc159526891.zip | |
4.4
Diffstat (limited to 'file_hierarchy.cpp')
| -rw-r--r-- | file_hierarchy.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/file_hierarchy.cpp b/file_hierarchy.cpp index 39b789fd..f5d2d28c 100644 --- a/file_hierarchy.cpp +++ b/file_hierarchy.cpp @@ -117,15 +117,15 @@ bool hasDirectChild(const HierarchyObject& hierObj, Predicate p) } -SyncOperation FileSystemObject::testSyncOperation(SyncDirection testSyncDir) const +SyncOperation FileSystemObject::testSyncOperation(SyncDirection testSyncDir, bool enabled) const { - return proposedSyncOperation(getCategory(), selectedForSynchronization, testSyncDir, syncDirConflict); + return proposedSyncOperation(getCategory(), enabled, testSyncDir, syncDirConflict); } SyncOperation FileSystemObject::getSyncOperation() const { - return FileSystemObject::testSyncOperation(syncDir); + return FileSystemObject::testSyncOperation(syncDir, selectedForSynchronization); //no *not* make a virtual call to testSyncOperation()! See FileMapping::testSyncOperation()! } @@ -205,9 +205,9 @@ SyncOperation DirMapping::getSyncOperation() const } -SyncOperation FileMapping::testSyncOperation(SyncDirection testSyncDir) const +SyncOperation FileMapping::testSyncOperation(SyncDirection testSyncDir, bool enabled) const { - SyncOperation op = FileSystemObject::testSyncOperation(testSyncDir); + SyncOperation op = FileSystemObject::testSyncOperation(testSyncDir, enabled); /* check whether we can optimize "create + delete" via "move": @@ -236,7 +236,7 @@ SyncOperation FileMapping::testSyncOperation(SyncDirection testSyncDir) const SyncOperation FileMapping::getSyncOperation() const { - return FileMapping::testSyncOperation(getSyncDir()); + return FileMapping::testSyncOperation(getSyncDir(), isActive()); } |