[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - wsd/LOOLWSD.cpp

[Aron Budea]

 wsd/LOOLWSD.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8a3fd8e3548543675223c0463b5cb9fb5804fe43
Author: Aron Budea <aron.budea at collabora.com>
Date:   Wed Nov 8 17:39:18 2017 +0100

    wsd: increase preinit timeout 5-fold
    
    Change-Id: I08ab74498ef9396edba5311a7e31b75c5932bbd6
    Reviewed-on: https://gerrit.libreoffice.org/44496
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index b3aaab7e..7aed341b 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2613,7 +2613,7 @@ int LOOLWSD::innerMain()
     {
         std::unique_lock<std::mutex> lock(NewChildrenMutex);
 
-        const auto timeoutMs = CHILD_TIMEOUT_MS * (LOOLWSD::NoCapsForKit ? 150 : 10);
+        const auto timeoutMs = 5 * CHILD_TIMEOUT_MS * (LOOLWSD::NoCapsForKit ? 150 : 10);
         const auto timeout = std::chrono::milliseconds(timeoutMs);
         // Make sure we have at least one before moving forward.
         LOG_TRC("Waiting for a new child for a max of " << timeoutMs << " ms.");