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

[Michael Meeks]

 loolwsd/LOOLWSD.cpp |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 275624284ec9db360135ac4e387c7be06f7b5f7d
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Wed Aug 31 22:05:02 2016 +0100

    Avoid profiling CL devices during jail setup.

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index e5853dc..240064b 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1359,6 +1359,9 @@ void LOOLWSD::initialize(Application& self)
     Log::warn("Launch this in your browser:");
     Log::warn(lcl_getLaunchURI());
 
+    // Otherwise we profile the soft-device at jail creation time.
+    setenv ("SAL_DISABLE_OPENCL", "true", 1);
+
     // In Trial Versions we might want to set some limits.
     LOOLWSD::NumDocBrokers = 0;
     LOOLWSD::NumConnections = 0;