diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:24:09 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:24:09 +0200 |
| commit | 110fc5dee14fc7988f631a158e50d283446aba7a (patch) | |
| tree | 7c19dfd3bdb8c4636409ec80a38c70499ac006db /file_hierarchy.h | |
| parent | 5.14 (diff) | |
| download | FreeFileSync-110fc5dee14fc7988f631a158e50d283446aba7a.tar.gz FreeFileSync-110fc5dee14fc7988f631a158e50d283446aba7a.tar.bz2 FreeFileSync-110fc5dee14fc7988f631a158e50d283446aba7a.zip | |
5.15
Diffstat (limited to 'file_hierarchy.h')
| -rw-r--r-- | file_hierarchy.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/file_hierarchy.h b/file_hierarchy.h index f51e76bb..d003e9ef 100644 --- a/file_hierarchy.h +++ b/file_hierarchy.h @@ -666,6 +666,7 @@ void FileSystemObject::setSyncDirConflict(const std::wstring& description) inline std::wstring FileSystemObject::getSyncOpConflict() const { + assert(getSyncOperation() == SO_UNRESOLVED_CONFLICT); return syncDirConflict ? *syncDirConflict : std::wstring(); } |