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

Aron Budea aron.budea at collabora.com
Mon Jan 22 15:02:45 UTC 2018


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

New commits:
commit 50fa572078d044ccd4054c99cbcc87294a44fa0e
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/48197
    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 79646ce2..3a0dcff2 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2712,7 +2712,7 @@ int LOOLWSD::innerMain()
         }
         else
         {
-            const auto timeoutMs = CHILD_TIMEOUT_MS * (LOOLWSD::NoCapsForKit ? 150 : 10);
+            const auto timeoutMs = CHILD_TIMEOUT_MS * (LOOLWSD::NoCapsForKit ? 150 : 50);
             const auto timeout = std::chrono::milliseconds(timeoutMs);
             LOG_TRC("Waiting for a new child for a max of " << timeoutMs << " ms.");
             if (!NewChildrenCV.wait_for(lock, timeout, []() { return !NewChildren.empty(); }))


More information about the Libreoffice-commits mailing list