diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-09-09 12:30:18 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-09-09 12:30:57 +0200 |
| commit | 3dfeae78cac187ec27f873271005c77aebafd038 (patch) | |
| tree | 4ab3fbb34d5afed49c27e2e640adb5bdae3520f2 | |
| parent | b95175cc41f96ce669d2a4d4c55034c1f80ac74b (diff) | |
vcl: restore lost hunk in Scheduler::ImplStartTimer()
Regression from commit 6d64d2f38d9f6c2f54e05675ecd0709eabf6d8ca (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
| -rw-r--r-- | vcl/source/app/scheduler.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx index c4fb7010ad1d..3f18ab7136af 100644 --- a/vcl/source/app/scheduler.cxx +++ b/vcl/source/app/scheduler.cxx @@ -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: */ |