Merge pull request #3514 from nextcloud/backport/3501/stable-3.2bugfix/vfsFixStable

[stable-3.2] avoid error when doing hydration when data socket is closed too early

2 files changed, 2 insertions, 2 deletions

diff --git a/src/libsync/vfs/cfapi/cfapiwrapper.cpp b/src/libsync/vfs/cfapi/cfapiwrapper.cpp
index 81b12f722..9a90829a8 100644
--- a/src/libsync/vfs/cfapi/cfapiwrapper.cpp
+++ b/src/libsync/vfs/cfapi/cfapiwrapper.cpp
@@ -206,8 +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) {
-            socket.close();
-            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);
 }