diff options
Diffstat (limited to 'src/asset.cc')
| -rw-r--r-- | src/asset.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/asset.cc b/src/asset.cc index d88c690d..330bd653 100644 --- a/src/asset.cc +++ b/src/asset.cc @@ -143,11 +143,15 @@ Asset::hash (function<void (float)> progress) const bool -Asset::equals (std::shared_ptr<const Asset> other, EqualityOptions, NoteHandler note) const +Asset::equals(std::shared_ptr<const Asset> other, EqualityOptions opt, NoteHandler note) const { if (_hash != other->_hash) { - note (NoteType::ERROR, "Asset: hashes differ"); - return false; + if (!opt.asset_hashes_can_differ) { + note(NoteType::ERROR, "Asset: hashes differ"); + return false; + } else { + note(NoteType::NOTE, "Asset: hashes differ"); + } } return true; |