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

github.com/nextcloud/desktop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Gallien <matthieu.gallien@nextcloud.com>2021-07-06 00:28:36 +0300
committerbackportbot[bot] <backportbot[bot]@users.noreply.github.com>2021-07-06 17:26:35 +0300
commitbb07a790d9cba74ca216f2b664c71dbe5888ecf4 (patch)
tree66fc752e77495a6bc78028605a0f24ebe233f188
parentaf12973a5f0e2f41c1e3755d5bc4de9f141b89dc (diff)
address review comments
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
-rw-r--r--src/libsync/vfs/cfapi/cfapiwrapper.cpp1
-rw-r--r--src/libsync/vfs/cfapi/hydrationjob.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/libsync/vfs/cfapi/cfapiwrapper.cpp b/src/libsync/vfs/cfapi/cfapiwrapper.cpp
index 6b875463a..9a90829a8 100644
--- a/src/libsync/vfs/cfapi/cfapiwrapper.cpp
+++ b/src/libsync/vfs/cfapi/cfapiwrapper.cpp
@@ -206,7 +206,6 @@ void CALLBACK cfApiFetchDataCallback(const CF_CALLBACK_INFO *callbackInfo, const
QObject::connect(vfs, &OCC::VfsCfApi::hydrationRequestFinished, &loop, [&](const QString &id) {
qDebug(lcCfApiWrapper) << "Hydration finished for request" << id;
if (requestId == id) {
- signalSocket.close();
loop.quit();
}
});
diff --git a/src/libsync/vfs/cfapi/hydrationjob.cpp b/src/libsync/vfs/cfapi/hydrationjob.cpp
index 56cb880fd..2031a8a01 100644
--- a/src/libsync/vfs/cfapi/hydrationjob.cpp
+++ b/src/libsync/vfs/cfapi/hydrationjob.cpp
@@ -147,6 +147,8 @@ void OCC::HydrationJob::cancel()
}
_signalSocket->write("cancelled");
+ _signalSocket->close();
+ _transferDataSocket->close();
emitFinished(Cancelled);
}