Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/libsync/propagateupload.cpp')
-rw-r--r--src/libsync/propagateupload.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/libsync/propagateupload.cpp b/src/libsync/propagateupload.cpp
index 952a91a28..59b9ed33b 100644
--- a/src/libsync/propagateupload.cpp
+++ b/src/libsync/propagateupload.cpp
@@ -89,7 +89,7 @@ void PUTFileJob::start()
AbstractNetworkJob::start();
}
-bool PUTFileJob::finished()
+void PUTFileJob::finished()
{
_device->close();
@@ -97,9 +97,6 @@ bool PUTFileJob::finished()
<< replyStatusString()
<< reply()->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt()
<< reply()->attribute(QNetworkRequest::HttpReasonPhraseAttribute);
-
- emit finishedSignal();
- return true;
}
void PUTFileJob::newReplyHook(QNetworkReply *reply)
@@ -493,7 +490,7 @@ void PropagateUploadFileCommon::addChildJob(AbstractNetworkJob *job)
{
_childJobs.insert(job);
connect(
- job, &AbstractNetworkJob::abstractJobFinished, this, [job, this] {
+ job, &AbstractNetworkJob::aboutToFinishedSignal, this, [job, this] {
_childJobs.erase(job);
},
Qt::DirectConnection);
@@ -619,7 +616,9 @@ void PropagateUploadFileCommon::abortNetworkJobs(
};
// Abort all running jobs, except for explicitly excluded ones
- for (auto *job : _childJobs) {
+ // perform actions on a copy as aborted jobs will be removed from _childJobs
+ const auto children = _childJobs;
+ for (auto *job : children) {
auto reply = job->reply();
if (!reply || !reply->isRunning())
continue;