diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-04-04 09:57:32 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-04-04 09:57:32 +0000 |
| commit | 5a0d48d287a5fb98c6ce2b0369d78cc41c2df1e8 (patch) | |
| tree | fed2fc11a6d7d5cb796778815a67e72ac62026a2 /vcl/aqua/source/app/salnstimer.mm | |
| parent | 4ea622e0930d760c3a8e91064a9e3b34a89d8fcc (diff) | |
INTEGRATION: CWS aquavcl06 (1.2.64); FILE MERGED
2008/03/18 18:25:41 pl 1.2.64.1: #i86581# timer recursion protection is not necessary on MacOS since timers get called on Yield only anyway. Moreover it was harmful since it didn not take yield levels into account
Diffstat (limited to 'vcl/aqua/source/app/salnstimer.mm')
| -rwxr-xr-x | vcl/aqua/source/app/salnstimer.mm | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/vcl/aqua/source/app/salnstimer.mm b/vcl/aqua/source/app/salnstimer.mm index 86884e8ad709..d8e492f394b2 100755 --- a/vcl/aqua/source/app/salnstimer.mm +++ b/vcl/aqua/source/app/salnstimer.mm @@ -4,9 +4,9 @@ * * $RCSfile: salnstimer.mm,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: ihi $ $Date: 2008-01-14 16:15:46 $ + * last change: $Author: kz $ $Date: 2008-04-04 10:57:32 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -46,15 +46,13 @@ @implementation TimerCallbackCaller -(void)timerElapsed:(NSTimer*)pTimer { - if( AquaSalTimer::bDispatchTimer && ! AquaSalTimer::bTimerInDispatch ) + ImplSVData* pSVData = ImplGetSVData(); + if( AquaSalTimer::bDispatchTimer ) { - ImplSVData* pSVData = ImplGetSVData(); if( pSVData->mpSalTimer ) { YIELD_GUARD; - AquaSalTimer::bTimerInDispatch = true; pSVData->mpSalTimer->CallCallback(); - AquaSalTimer::bTimerInDispatch = false; // NSTimer does not end nextEventMatchingMask of NSApplication // so we need to wakeup a waiting Yield to inform it something happened |