summaryrefslogtreecommitdiff
diff options
authorAndrea Azzarone <azzaronea@gmail.com>2014-03-21 23:22:12 +0000
committerCI bot <ps-jenkins@lists.canonical.com>2014-03-21 23:22:12 +0000
commitf805fae7478f1d017322c7f1f89ccd92cf66d1fb (patch)
tree446bd155da523c918a7ac92cc6148b454eb74166
parent76561ab277db3155ba85cf08753e67bc0fc91d58 (diff)
parent888682ae5202ba251e9d4436648c112f8fd0d916 (diff)
Release the lockscreen_timeout (that we use to get the grab properly) on unlock.
(bzr r3739)
-rw-r--r--lockscreen/LockScreenController.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/lockscreen/LockScreenController.cpp b/lockscreen/LockScreenController.cpp
index dabe12948..6904ee075 100644
--- a/lockscreen/LockScreenController.cpp
+++ b/lockscreen/LockScreenController.cpp
@@ -231,6 +231,8 @@ void Controller::ShowShields()
void Controller::OnUnlockRequested()
{
+ lockscreen_timeout_.release();
+
if (!IsLocked())
return;