diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:17:51 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:17:51 +0200 |
| commit | 237aedc590b58c0e69d7dfcac92b5f767b7c004a (patch) | |
| tree | 83f361a82ba483f2daf83b677e8685cd953812d9 /file_hierarchy.cpp | |
| parent | 4.5 (diff) | |
| download | FreeFileSync-237aedc590b58c0e69d7dfcac92b5f767b7c004a.tar.gz FreeFileSync-237aedc590b58c0e69d7dfcac92b5f767b7c004a.tar.bz2 FreeFileSync-237aedc590b58c0e69d7dfcac92b5f767b7c004a.zip | |
4.6
Diffstat (limited to 'file_hierarchy.cpp')
| -rw-r--r-- | file_hierarchy.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/file_hierarchy.cpp b/file_hierarchy.cpp index 5bd7c5bb..987713cb 100644 --- a/file_hierarchy.cpp +++ b/file_hierarchy.cpp @@ -119,7 +119,7 @@ bool hasDirectChild(const HierarchyObject& hierObj, Predicate p) SyncOperation FileSystemObject::testSyncOperation(SyncDirection testSyncDir, bool active) const { - return proposedSyncOperation(getCategory(), active, testSyncDir, syncDirConflict); + return proposedSyncOperation(getCategory(), active, testSyncDir, getSyncOpConflict()); } |