[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd-3-2' - wsd/Admin.cpp

[Michael Meeks]

 wsd/Admin.cpp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit d5deed4a3737292a46fd8314859c9f7f76084736
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Tue May 15 10:52:56 2018 +0100

    Start the admin thread even if it is disabled.
    
    The admin thread does memory cleanup as well which is required.
    This also reduces logging churn.
    
    Change-Id: I1c6cfaf6085b685f230dc24ae1716b0256d892f8
    Reviewed-on: https://gerrit.libreoffice.org/54365
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/wsd/Admin.cpp b/wsd/Admin.cpp
index 7645f74cd..ba24004ec 100644
--- a/wsd/Admin.cpp
+++ b/wsd/Admin.cpp
@@ -614,8 +614,7 @@ void Admin::dumpState(std::ostream& os)
 
 void Admin::start()
 {
-    if (LOOLWSD::AdminEnabled)
-        startThread();
+    startThread();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */