[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - drawinglayer/source

[Miklos Vajna (via logerrit)]

 drawinglayer/source/primitive2d/sceneprimitive2d.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 945455c0af44bebe8ca0b111bf6664450192f919
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Fri Jun 21 16:01:51 2019 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Jun 21 20:15:56 2019 +0200

    drawinglayer: disable multi-threaded rendering in sceneprimitive2d
    
    It seems this is not stable yet:
    
    - https://dev-builds.libreoffice.org/crashtest/27e3ed0d25735603d2c82744e3a8f5f3e0a8d043/backtraces/task395-core.16181.backtrace.txt
    - https://ci.libreoffice.org/job/gerrit_linux_gcc_release/35032/console
    
    Go back to disabling that by default for now.
    
    Change-Id: I6cd870d2661bfb99b8ed5008c2542fede05ae8c8
    Reviewed-on: https://gerrit.libreoffice.org/74523
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
index b747e8e6a759..6d9dd7a9c8c2 100644
--- a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
@@ -372,7 +372,7 @@ namespace drawinglayer
                         nOversampleValue ? nRasterHeight * nOversampleValue : nRasterHeight);
 
                     // check for parallel execution possibilities
-                    static bool bMultithreadAllowed = true; // loplugin:constvars:ignore
+                    static bool bMultithreadAllowed = false; // loplugin:constvars:ignore
                     sal_Int32 nThreadCount(0);
                     comphelper::ThreadPool& rThreadPool(comphelper::ThreadPool::getSharedOptimalPool());