diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-03-10 12:52:36 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-03-10 12:53:13 +0100 |
| commit | bbd419d9bfa8fee66d3a9cfa8b592087e25da285 (patch) | |
| tree | e00c75baef89d9605aeb5e7aca65eb0ff1ee793c /vcl/osx/saltimer.cxx | |
| parent | 62c9eb97853dcdb89bf30983c5318c45ed8e977c (diff) | |
Avoid calls on null mpSalTimer on OS X
all three addressed places hit frequently now during "make check", likely
related to recent changes to timer/idle code?
Change-Id: I75963c707807c29db7865b11f9ed532b779765d8
Diffstat (limited to 'vcl/osx/saltimer.cxx')
| -rw-r--r-- | vcl/osx/saltimer.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/vcl/osx/saltimer.cxx b/vcl/osx/saltimer.cxx index 6c83af7c77c5..377044730e76 100644 --- a/vcl/osx/saltimer.cxx +++ b/vcl/osx/saltimer.cxx @@ -90,9 +90,12 @@ void AquaSalTimer::handleStartTimerEvent( NSEvent* pEvent ) if( (posted - current) <= 0.0 ) { YIELD_GUARD; - // timer already elapsed since event posted - bool idle = true; // TODO - pSVData->mpSalTimer->CallCallback( idle ); + if( pSVData->mpSalTimer ) + { + // timer already elapsed since event posted + bool idle = true; // TODO + pSVData->mpSalTimer->CallCallback( idle ); + } } ImplSalStartTimer( sal_uLong( [pEvent data1] ) ); } |