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

[Philippe Jung]

 cui/source/customize/macropg.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f4f211619c4006ae99ec365f47d199c43fa21874
Author: Philippe Jung <phil.jung at free.fr>
Date:   Mon May 11 12:18:30 2015 +0200

    LO crash when Tools -> Customize -> Event -> ESC
    
    Change-Id: Iae2687d980b126912ed1e9c7045605a90aeb7ffe
    Reviewed-on: https://gerrit.libreoffice.org/15700
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index b0b964c..c50b487 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -123,7 +123,8 @@ bool MacroEventListBox::Notify( NotifyEvent& rNEvt )
     if( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
     {
         if ( rNEvt.GetWindow() != maListBox.get() )
-            maListBox->GrabFocus();
+            if (maListBox)
+                maListBox->GrabFocus();
     }
 
     return nRet;