vcl/source/opengl/OpenGLHelper.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
New commits: commit 6a5bf6cf0b03390e1f8518a0934db23567443b40 Author: Michael Meeks <michael.me...@collabora.com> Date: Sat Sep 10 23:55:10 2016 +0100 Correct watchdog initialization, and extend timeouts for old hardware. Change-Id: Icda60b257655881ec1cee4621f1491cb1f011a38 diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx index 5dff689..39ea205 100644 --- a/vcl/source/opengl/OpenGLHelper.cxx +++ b/vcl/source/opengl/OpenGLHelper.cxx @@ -817,17 +817,17 @@ OpenGLWatchdogThread::OpenGLWatchdogThread() void OpenGLWatchdogThread::execute() { // delays to take various actions in 1/4 of a second increments. - static const int nDisableEntries[2] = { 6 /* 1.5s */, 20 /* 5s */ }; - static const int nAbortAfter[2] = { 20 /* 10s */, 120 /* 30s */ }; + static const int nDisableEntries[2] = { 20 /* 5s */, 60 /* 15s */ }; + static const int nAbortAfter[2] = { 40 /* 10s */, 240 /* 60s */ }; int nUnchanged = 0; // how many unchanged nEnters - TimeValue aHalfSecond(0, 1000*1000*1000*0.25); + TimeValue aQuarterSecond(0, 1000*1000*1000*0.25); bool bAbortFired = false; do { sal_uInt64 nLastEnters = OpenGLZone::gnEnterCount; - osl_waitCondition(gpWatchdogExit, &aHalfSecond); + osl_waitCondition(gpWatchdogExit, &aQuarterSecond); if (OpenGLZone::isInZone()) { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits