From 2c3bb2d1bbef76d96f08952b3e25a7a9814425e5 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Tue, 10 Nov 2009 22:19:51 +0000
Subject: [PATCH] CtrlCore: X11 TakeFocus fix (thanks mrjt)

git-svn-id: svn://ultimatepp.org/upp/trunk@1690 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/CtrlCore/X11Wnd.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/uppsrc/CtrlCore/X11Wnd.cpp b/uppsrc/CtrlCore/X11Wnd.cpp
index c3d9a0c6b..c23bff178 100644
--- a/uppsrc/CtrlCore/X11Wnd.cpp
+++ b/uppsrc/CtrlCore/X11Wnd.cpp
@@ -836,9 +836,10 @@ void Ctrl::TakeFocus()
 		return;
 	}
 	LLOG("TAKE_FOCUS " << Name());
-	ClearKbdState_();
-	if(IsEnabled() && IsVisible() && top->window != GetXServerFocusWindow())
+	if(IsEnabled() && IsVisible() && top->window != GetXServerFocusWindow()) {
+		ClearKbdState_();
 		SetWndFocus();
+	}
 	if(this != focusCtrlWnd) {
 		if(IsEnabled()) {
 			SetLastActive(w, this);