diff options
Diffstat (limited to 'file_hierarchy.cpp')
| -rw-r--r-- | file_hierarchy.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/file_hierarchy.cpp b/file_hierarchy.cpp index bf557655..35abf251 100644 --- a/file_hierarchy.cpp +++ b/file_hierarchy.cpp @@ -42,6 +42,8 @@ SyncOperation getIsolatedSyncOperation(CompareFilesResult cmpResult, SyncDirection syncDir, bool hasDirConflict) //perf: std::wstring was wasteful here { + assert(!hasDirConflict || syncDir == SYNC_DIR_NONE); + if (!selectedForSynchronization) return cmpResult == FILE_EQUAL ? SO_EQUAL : |