diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:21:59 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:21:59 +0200 |
| commit | d4af25c52a28b93484ffb55e0a8027bc4ce7856f (patch) | |
| tree | 853d57468d6b370711e7a5dd2c3dc7d5bac81b10 /file_hierarchy.cpp | |
| parent | 5.8 (diff) | |
| download | FreeFileSync-d4af25c52a28b93484ffb55e0a8027bc4ce7856f.tar.gz FreeFileSync-d4af25c52a28b93484ffb55e0a8027bc4ce7856f.tar.bz2 FreeFileSync-d4af25c52a28b93484ffb55e0a8027bc4ce7856f.zip | |
5.9
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 : |