From: Jocelyn Turcotte <jturcotte@woboq.com>
Date: Wed, 3 Aug 2016 14:35:24 +0000 (+0200)
Subject: Revert "Fix a deadlock when shutting down during discovery" (#5100)
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~1111^2~26
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b307f2b65c9fa94ee917e4b34ed7a4c19ed99793;p=nextcloud-desktop.git

Revert "Fix a deadlock when shutting down during discovery" (#5100)

Reverts commit 622017adcf3b1a914221acc0bb2c17e1429ea4c3

Could be the cause of #5092 and the cost is higher than the benefit if this is the case.
A network request taking more than 30 seconds isn't something unlikely in this world
and shouldn't be a good reason to abort. We should try to untangle the threads
dependencies to properly fix this if possible instead.
---

diff --git a/src/libsync/discoveryphase.cpp b/src/libsync/discoveryphase.cpp
index 52a454e9c..c85fe2d3c 100644
--- a/src/libsync/discoveryphase.cpp
+++ b/src/libsync/discoveryphase.cpp
@@ -564,7 +564,7 @@ csync_vio_handle_t* DiscoveryJob::remote_vio_opendir_hook (const char *url,
         discoveryJob->_vioMutex.lock();
         const QString qurl = QString::fromUtf8(url);
         emit discoveryJob->doOpendirSignal(qurl, directoryResult.data());
-        discoveryJob->_vioWaitCondition.wait(&discoveryJob->_vioMutex, 30000);
+        discoveryJob->_vioWaitCondition.wait(&discoveryJob->_vioMutex, ULONG_MAX); // FIXME timeout?
         discoveryJob->_vioMutex.unlock();
 
         qDebug() << discoveryJob << url << "...Returned from main thread";