summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorPhilippe Jung <phil.jung@free.fr>2015-05-11 12:18:30 +0200
committerMichael Meeks <michael.meeks@collabora.com>2015-05-11 10:40:18 +0000
commitf4f211619c4006ae99ec365f47d199c43fa21874 (patch)
tree54a6b05baef0997cc31b4ededf4d02612fb9c3cb /cui
parent598b05f053a75abca920cafa208af2950bdcd1f7 (diff)
LO crash when Tools -> Customize -> Event -> ESC
Change-Id: Iae2687d980b126912ed1e9c7045605a90aeb7ffe Reviewed-on: https://gerrit.libreoffice.org/15700 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'cui')
-rw-r--r--cui/source/customize/macropg.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index b0b964c6f794..c50b487a200a 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;