summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-05-31 10:11:01 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-05-31 10:26:53 +0100
commitab0dc9524a36a394e97df9499bf1f5e4b94cfdca (patch)
treefdaf664d9a348e6c5299bbea142f3ce0282504d7
parentc380f0fc125f50ad8efca2ce032d3d2a67d78f0a (diff)
Resolves: tdf#92695 protect both branches against missing ToolItem
Change-Id: Ide54fddf7b217e65a405bd80853d5302a419f046
-rw-r--r--vcl/source/window/toolbox.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 8a89ff26257a..903ea8c6d14b 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -4986,7 +4986,7 @@ bool ToolBox::ImplActivateItem( vcl::KeyCode aKeyCode )
else
{
mnDownItemId = mnCurItemId = mnHighItemId;
- if ( pToolItem->mnBits & ToolBoxItemBits::AUTOCHECK )
+ if (pToolItem && (pToolItem->mnBits & ToolBoxItemBits::AUTOCHECK))
{
if ( pToolItem->mnBits & ToolBoxItemBits::RADIOCHECK )
{