summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qapplication_s60.cpp
diff options
context:
space:
mode:
authorGareth Stockwell <gareth.stockwell@sosco.com>2009-10-13 13:53:19 (GMT)
committerGareth Stockwell <gareth.stockwell@sosco.com>2009-10-13 13:53:19 (GMT)
commitb7142463c738cc1a0540fe456002fe94e7f5a894 (patch)
treefc071354df1d59df139027e2a61809202e5ade6a /src/gui/kernel/qapplication_s60.cpp
parent02fbfdbdd01430e4843b470f1a6fd14e00a4583c (diff)
downloadQt-b7142463c738cc1a0540fe456002fe94e7f5a894.zip
Qt-b7142463c738cc1a0540fe456002fe94e7f5a894.tar.gz
Qt-b7142463c738cc1a0540fe456002fe94e7f5a894.tar.bz2
Modified QSymbianControl::setFocusSafely to set last focused control
to zero only if currently focused Reviewed-by: axis
Diffstat (limited to 'src/gui/kernel/qapplication_s60.cpp')
-rw-r--r--src/gui/kernel/qapplication_s60.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
index acd1041..b1706af 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/kernel/qapplication_s60.cpp
@@ -948,7 +948,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);
}
}