[Libreoffice-commits] core.git: vcl/source

[Stephan Bergmann]

 vcl/source/control/ctrl.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 727c5b5fbd9392ce476a9a27c9f11f0a3000e0fb
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Sep 10 15:22:28 2015 +0200

    Calling empty std::function behaves different than calling empty Link
    
    ...regression introduced with a50cd18768289c65debeed5ec507cf37095365b8 "make
    Control::ImplCallEventListenersAndHandler take a lambda"
    
    Change-Id: I62e66d71cd36e55d68cf15c70dc9e06214f7e312

diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index 7eafeb3..4793fdb 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -328,7 +328,10 @@ bool Control::ImplCallEventListenersAndHandler( sal_uLong nEvent, std::function<
 
     if ( !xThis->IsDisposed() )
     {
-        callHandler();
+        if (callHandler)
+        {
+            callHandler();
+        }
 
         if ( !xThis->IsDisposed() )
             return false;