From 886588aea9283932185ee06341145233a4684289 Mon Sep 17 00:00:00 2001
From: Gareth Stockwell <gareth.stockwell@sosco.com>
Date: Tue, 13 Oct 2009 14:53:19 +0100
Subject: Modified QSymbianControl::setFocusSafely to set last focused control
 to zero only if currently focused

Reviewed-by: axis
---
 src/gui/kernel/qapplication_s60.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
index 115e135..6d50e55 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/kernel/qapplication_s60.cpp
@@ -949,7 +949,8 @@ void QSymbianControl::setFocusSafely(bool focus)
         S60->appUi()->RemoveFromStack(this);
         QT_TRAP_THROWING(S60->appUi()->AddToStackL(this,
                 ECoeStackPriorityDefault, ECoeStackFlagStandard));
-        lastFocusedControl = 0;
+        if(this == lastFocusedControl)
+            lastFocusedControl = 0;
         this->SetFocus(false);
     }
 }
-- 
cgit v0.12