From bbd419d9bfa8fee66d3a9cfa8b592087e25da285 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 10 Mar 2015 12:52:36 +0100
Subject: 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
---
 vcl/osx/salinst.cxx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'vcl/osx/salinst.cxx')

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 );
+                }
             }
         }
 
-- 
cgit