From 90d8bf72d9ea8fa678707326a3cc4b84fae154a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Thu, 7 May 2015 14:18:44 +0100 Subject: [PATCH] VclPtr: clicking on another sidebar button when navigator open crashes Change-Id: Iafcc7246a1149a25f6d6fdfb09cf3e85227580db --- sd/source/ui/sidebar/NavigatorWrapper.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sd/source/ui/sidebar/NavigatorWrapper.cxx b/sd/source/ui/sidebar/NavigatorWrapper.cxx index 972a737ac707..bd3a13a62784 100644 --- a/sd/source/ui/sidebar/NavigatorWrapper.cxx +++ b/sd/source/ui/sidebar/NavigatorWrapper.cxx @@ -77,7 +77,10 @@ void NavigatorWrapper::UpdateNavigator() void NavigatorWrapper::GetFocus() { - maNavigator->GrabFocus(); + if (maNavigator) + maNavigator->GrabFocus(); + else + Control::GetFocus(); } } } // end of namespace sd::sidebar