summaryrefslogtreecommitdiff
path: root/vcl/osx/salinst.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-03-10 12:52:36 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-03-10 12:53:13 +0100
commitbbd419d9bfa8fee66d3a9cfa8b592087e25da285 (patch)
treee00c75baef89d9605aeb5e7aca65eb0ff1ee793c /vcl/osx/salinst.cxx
parent62c9eb97853dcdb89bf30983c5318c45ed8e977c (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/salinst.cxx')
-rw-r--r--vcl/osx/salinst.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index b12523050031..105a9a914553 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -646,8 +646,11 @@ void AquaSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents )
{
// this cause crashes on MacOSX 10.4
// [AquaSalTimer::pRunningTimer fire];
- bool idle = true; // TODO
- ImplGetSVData()->mpSalTimer->CallCallback( idle );
+ if (ImplGetSVData()->mpSalTimer != nullptr)
+ {
+ bool idle = true; // TODO
+ ImplGetSVData()->mpSalTimer->CallCallback( idle );
+ }
}
}