Skip to content

Commit

Permalink
only compute checksum of a local file that is not a virtual one
Browse files Browse the repository at this point in the history
should avoid triggering implicit hydration from within the desktop
client

triggering an implicit hydration on our own is strictly forbidden as
that is causing issues like deadlock and failed hydration attempts

Signed-off-by: Matthieu Gallien <[email protected]>
  • Loading branch information
mgallien committed May 15, 2024
1 parent 497fac8 commit 30826ea
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/libsync/propagatedownload.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1131,7 +1131,8 @@ void PropagateDownloadFile::contentChecksumComputed(const QByteArray &checksumTy
SyncJournalFileRecord record;
if (_item->_instruction != CSYNC_INSTRUCTION_CONFLICT && FileSystem::fileExists(localFilePath)
&& (propagator()->_journal->getFileRecord(_item->_file, &record) && record.isValid())
&& (record._modtime == _item->_modtime && record._etag != _item->_etag)) {
&& (record._modtime == _item->_modtime && record._etag != _item->_etag)
&& _item->_type == ItemTypeFile) {
const auto computeChecksum = new ComputeChecksum(this);
computeChecksum->setChecksumType(checksumType);
connect(computeChecksum, &ComputeChecksum::done, this, &PropagateDownloadFile::localFileContentChecksumComputed);
Expand Down

0 comments on commit 30826ea

Please sign in to comment.