diff options
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(); } |