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:31:11 +0100
commitc845c7bf597caa11b1617ab71029c499819028bc (patch)
tree2b8204f92d8353f85323f685aa550dc0d55d1d9a
parentdf668868917d1dac11d49f1f650c43666fadea54 (diff)
Resolves: tdf#92695 protect both branches against missing ToolItem
Change-Id: Ide54fddf7b217e65a405bd80853d5302a419f046 (cherry picked from commit ab0dc9524a36a394e97df9499bf1f5e4b94cfdca)
-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 4a5116cc3287..379bca3057ce 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -5010,7 +5010,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 )
{