summaryrefslogtreecommitdiff
path: root/vcl/source/window/window2.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-06-09 16:52:21 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-06-09 17:19:33 +0100
commit9b7dfb10641ba7978ffcbd1db0507163411ae027 (patch)
treeb768052d8e5c51cba247e6cc46d0ac0cca3bf573 /vcl/source/window/window2.cxx
parent98da362f1691734437cb37f902fb1cdab613ac0a (diff)
EndSaveFocus does nothing on the !bRestore case
Change-Id: I8e199535803faf364469f9b9df46f339febe25c6
Diffstat (limited to 'vcl/source/window/window2.cxx')
-rw-r--r--vcl/source/window/window2.cxx12
1 files changed, 3 insertions, 9 deletions
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 2878e0ab09bc..17b48cbaba2c 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -421,17 +421,11 @@ VclPtr<vcl::Window> Window::SaveFocus()
return nullptr;
}
-void Window::EndSaveFocus( const VclPtr<vcl::Window>& xFocusWin, bool bRestore )
+void Window::EndSaveFocus(const VclPtr<vcl::Window>& xFocusWin)
{
- if ( xFocusWin == nullptr )
- return;
- else
+ if (xFocusWin && !xFocusWin->IsDisposed())
{
- if ( !xFocusWin->IsDisposed() )
- {
- if ( bRestore )
- xFocusWin->GrabFocus();
- }
+ xFocusWin->GrabFocus();
}
}