[Libreoffice-commits] online.git: wsd/Admin.cpp

Michael Meeks michael.meeks at collabora.com
Tue May 15 09:58:31 UTC 2018


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

New commits:
commit bb49e17e8f70e50caa653be625fa497f51c3135f
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

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


More information about the Libreoffice-commits mailing list