diff --git a/src/libsync/vfs/cfapi/vfs_cfapi.cpp b/src/libsync/vfs/cfapi/vfs_cfapi.cpp index 7a5da1e0e..be0eb5f23 100644 --- a/src/libsync/vfs/cfapi/vfs_cfapi.cpp +++ b/src/libsync/vfs/cfapi/vfs_cfapi.cpp @@ -307,9 +307,15 @@ void VfsCfApi::fileStatusChanged(const QString &systemFileName, SyncFileStatus f void VfsCfApi::scheduleHydrationJob(const QString &requestId, const QString &folderPath) { - Q_ASSERT(std::none_of(std::cbegin(d->hydrationJobs), std::cend(d->hydrationJobs), [=](HydrationJob *job) { + const auto jobAlreadyScheduled = std::any_of(std::cbegin(d->hydrationJobs), std::cend(d->hydrationJobs), [=](HydrationJob *job) { return job->requestId() == requestId || job->folderPath() == folderPath; - })); + }); + + if (jobAlreadyScheduled) { + qCWarning(lcCfApi) << "The OS submitted again a hydration request which is already on-going" << requestId << folderPath; + emit hydrationRequestFailed(requestId); + return; + } if (d->hydrationJobs.isEmpty()) { emit beginHydrating();