summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2016-10-30 02:02:10 +0100
committerJan-Marek Glogowski <glogow@fbihome.de>2017-07-13 12:10:26 +0200
commit69977ed917a92d9b07f3429312077357d3aa10fa (patch)
tree80033708e7caf48e1e061fc5baeb28acd92e7644
parent5229f15904b42238273d1fa98ca8dcf6efda48f5 (diff)
WIN just wait for the Yield mutex in the timerout
Don't re-schedule a timeout, simply wait in the timer callback. Change-Id: Ib46eb6dbf57f29c85ffdbd6492922020f7785d30
-rw-r--r--vcl/win/app/saltimer.cxx13
1 files changed, 3 insertions, 10 deletions
diff --git a/vcl/win/app/saltimer.cxx b/vcl/win/app/saltimer.cxx
index af379700c5bd..2ddb34b8f0b6 100644
--- a/vcl/win/app/saltimer.cxx
+++ b/vcl/win/app/saltimer.cxx
@@ -154,16 +154,9 @@ void EmitTimerCallback()
if ( ! pSVData->maSchedCtx.mpSalTimer )
return;
- // Try to acquire the mutex. If we don't get the mutex then we
- // try this a short time later again.
- if (ImplSalYieldMutexTryToAcquire())
- {
- pSVData->maSchedCtx.mpSalTimer->CallCallback();
-
- ImplSalYieldMutexRelease();
- }
- else
- ImplSalStartTimer( 10 );
+ ImplSalYieldMutexAcquireWithWait();
+ pSVData->maSchedCtx.mpSalTimer->CallCallback();
+ ImplSalYieldMutexRelease();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */