[Libreoffice-commits] core.git: desktop/source

Samuel Mehrbrodt Samuel.Mehrbrodt at cib.de
Mon Oct 17 09:33:46 UTC 2016


 desktop/source/app/opencl.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit d10d846eb9dd5f1f4e9577c62ad169f865b8a647
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Mon Oct 17 09:33:26 2016 +0200

    Force disable OpenCL in Safe Mode
    
    Change-Id: I046eb2a01c528945232cedabbf5fa08483c9e057
    Reviewed-on: https://gerrit.libreoffice.org/29960
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/desktop/source/app/opencl.cxx b/desktop/source/app/opencl.cxx
index f9f7dd2..6d22e92 100644
--- a/desktop/source/app/opencl.cxx
+++ b/desktop/source/app/opencl.cxx
@@ -120,6 +120,7 @@ bool testOpenCLCompute(const Reference< XDesktop2 > &xDesktop, const OUString &r
 void Desktop::CheckOpenCLCompute(const Reference< XDesktop2 > &xDesktop)
 {
     if (getenv("SAL_DISABLE_OPENCL") ||
+        Application::IsSafeModeEnabled() ||
         !officecfg::Office::Common::Misc::UseOpenCL::get())
         return;
 


More information about the Libreoffice-commits mailing list