Kaydet (Commit) 3dfeae78 authored tarafından Miklos Vajna's avatar Miklos Vajna

vcl: restore lost hunk in Scheduler::ImplStartTimer()

Regression from commit 6d64d2f3 (Minor
refactoring and cleanup of Scheduler and Timer., 2015-07-19), the old
Timer::ImplStartTimer() used to set nMS to at least 1, but the new
Scheduler::ImplStartTimer() didn't do that.

With this, JunitTest_sw_unoapi_3 no longer hangs for me.

Change-Id: I16ad360f1e5430cde7ec8b28e8c2620d260c9ec0
üst b95175cc
......@@ -116,6 +116,9 @@ void Scheduler::ImplStartTimer(sal_uInt64 nMS, bool bForce)
ImplSVData* pSVData = ImplGetSVData();
InitSystemTimer(pSVData);
if ( !nMS )
nMS = 1;
// Update timeout only when not in timer handler and
// only if smaller timeout, to avoid skipping.
if (bForce || (!pSVData->mnUpdateStack &&
......@@ -290,3 +293,5 @@ Scheduler::~Scheduler()
mpSchedulerData->mpScheduler = NULL;
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment