[Libreoffice-commits] online.git: kit/ForKit.cpp

Michael Meeks michael.meeks at collabora.com
Sat Apr 8 12:43:44 UTC 2017


 kit/ForKit.cpp |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 36900f7d78bd6c08e8e065ecb2425c4052521470
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Sat Apr 8 13:31:07 2017 +0100

    Clear display to avoid potential problems.
    
    Running --nocaps under massif; it is unexpected to see
    fire_glxtest_process doing heavy lifting glx work.

diff --git a/kit/ForKit.cpp b/kit/ForKit.cpp
index 59da5d64..035f69a9 100644
--- a/kit/ForKit.cpp
+++ b/kit/ForKit.cpp
@@ -453,6 +453,10 @@ int main(int argc, char** argv)
         "user:*file://" LOOLWSD_CONFIGDIR "/loolkitconfig.xcu "
 #endif
         );
+
+    // No-caps tracing can spawn eg. glxinfo & other oddness.
+    unsetenv("DISPLAY");
+
     ::setenv("CONFIGURATION_LAYERS", layers.c_str(),
              1 /* override */);
 


More information about the Libreoffice-commits mailing list